From 9080f16e29363b99f7d9e659ceb7d236aa36bafa Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 08 Mar 2021 08:31:36 +0800
Subject: [PATCH] 修改数据库
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 fc2f294..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;
/**
* 序号
@@ -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,7 +177,21 @@
*/
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;
@@ -173,6 +201,22 @@
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;
}
--
Gitblit v1.9.1