From f3b34b0c7ba026e686d58af93ab8ae5ad6aa9f48 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Mar 2021 18:27:55 +0800
Subject: [PATCH] 分销员后台1
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 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 0b49d2f..7f34c77 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,7 @@
package com.matrix.system.hive.bean;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -114,6 +115,8 @@
* 订单明细
*/
private List<SysOrderItem> items;
+
+ private List<SysOrderFlow> flows;
/**
* 会员姓名
*/
@@ -131,6 +134,8 @@
private String staffName;
private String shopName;
+
+ private String shopShortName;
private Long searchShop;
/**
@@ -149,12 +154,63 @@
/**
* 表单搜索条件（开始时间结束时间）
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTimeVo;
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date endTimeVo;
+ /**
+ * 消费次数
+ */
+ 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 String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public Integer getTimes() {
+ return times;
+ }
+
+ public void setTimes(Integer times) {
+ this.times = times;
+ }
public String getBeatuyId() {
return beatuyId;
--
Gitblit v1.9.1