From b4da2725da57633daff22eed89f09d6e33f18560 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 05 Mar 2021 08:47:12 +0800
Subject: [PATCH] 修改数据库
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index d1a33cf..191f430 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -1,6 +1,5 @@
package com.matrix.system.hive.bean;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,7 +15,15 @@
*/
public class SysOrder implements Serializable {
- private static final long serialVersionUID = 1L;
+ /**
+ * 订单类型-销售订单
+ */
+ public static final int ORDER_TYPE_SEAL= 1;
+
+ /**
+ * 订单类型-退款订单
+ */
+ public static final int ORDER_TYPE_REFUND= 2;
/**
* 序号
@@ -31,14 +38,12 @@
/**
* 下单时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date orderTime;
/**
* 收款
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date payTime;
@@ -117,6 +122,8 @@
* 订单明细
*/
private List<SysOrderItem> items;
+
+ private List<SysOrderFlow> flows;
/**
* 会员姓名
*/
@@ -126,7 +133,12 @@
* 会员姓名
*/
private String vipNo;
-
+
+ /**
+ * 订单类型1，销售订单，2退款订单
+ */
+ private Integer orderType;
+
/* 会员手机号
*/
private String vipPhone;
@@ -134,6 +146,8 @@
private String staffName;
private String shopName;
+
+ private String shopShortName;
private Long searchShop;
/**
@@ -163,6 +177,54 @@
*/
private Integer times;
+
+ private String type;
+
+ /**
+ * 原有订单ID 退款时使用
+ */
+ private Long oldOrderId;
+
+ public Long getOldOrderId() {
+ return oldOrderId;
+ }
+
+ public void setOldOrderId(Long oldOrderId) {
+ this.oldOrderId = oldOrderId;
+ }
+
+ public List<SysOrderFlow> getFlows() {
+ return flows;
+ }
+
+ public void setFlows(List<SysOrderFlow> flows) {
+ this.flows = flows;
+ }
+
+ public String getShopShortName() {
+ return shopShortName;
+ }
+
+ public void setShopShortName(String shopShortName) {
+ this.shopShortName = shopShortName;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public Integer getTimes() {
return times;
}
--
Gitblit v1.9.1