From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
index cd65390..ead0b54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
@@ -29,18 +29,29 @@
// 瀹為檯鎬绘暟閲�
private Integer totalCount;
// 瀹為檯鎬讳粯娆�
- private BigDecimal totalSettlement;
+ private BigDecimal totalPayment;
+ // 瀹為檯鎬荤粨绠�
+ private BigDecimal totalSettlement;
// 绾㈠寘绫诲瀷锛�
private Integer hongBaoType;
// 璁㈠崟鎬婚浼板閲�
private BigDecimal hongBao;
- // 绾㈠寘鐘舵��
- private Integer hongBaoState;
-
+ // 1 娣樺疂 2 澶╃尗
+ @Expose
+ private Integer orderType;
+ // 绾㈠寘鐘舵��
+ @Expose
+ private Integer hongBaoState;
+ // 鍒拌处鏃堕棿
+ @Expose
+ private String hongBaoDate;
// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
@Expose
private String hongBaoTypePic;
+ // 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+ @Expose
+ private String orderOrigin;
// 璁㈠崟鐘舵��
@Expose
private Map<String, String> orderState;
@@ -49,7 +60,7 @@
private Map<String, String> hongBaoInfo;
// 鍒拌处鐘舵��
@Expose
- private Map<String, String> accountState;
+ private Map<String, String> accountState;
// 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
@Expose
private Long obtainTime;
@@ -59,12 +70,6 @@
// 鏀惰揣鏃堕棿
@Expose
private String receiveTime;
- // 鍒拌处鏃堕棿
- @Expose
- private String getTime;
- // 棰勮鍒拌处鏃堕棿
- @Expose
- private String preGetTime;
// 璁㈠崟涓嬬殑鍟嗗搧
@Expose
private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
@@ -126,21 +131,6 @@
this.receiveTime = receiveTime;
}
- public String getGetTime() {
- return getTime;
- }
-
- public void setGetTime(String getTime) {
- this.getTime = getTime;
- }
-
- public String getPreGetTime() {
- return preGetTime;
- }
-
- public void setPreGetTime(String preGetTime) {
- this.preGetTime = preGetTime;
- }
public List<CommonOrderGoodsVO> getListOrderGoods() {
return listOrderGoods;
@@ -182,14 +172,6 @@
this.hongBaoTypePic = hongBaoTypePic;
}
- public Map<String, String> getAccountState() {
- return accountState;
- }
-
- public void setAccountState(Map<String, String> accountState) {
- this.accountState = accountState;
- }
-
public Map<String, String> getHongBaoInfo() {
return hongBaoInfo;
}
@@ -206,5 +188,46 @@
this.orderState = orderState;
}
+ public String getHongBaoDate() {
+ return hongBaoDate;
+ }
+
+ public void setHongBaoDate(String hongBaoDate) {
+ this.hongBaoDate = hongBaoDate;
+ }
+
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Map<String, String> getAccountState() {
+ return accountState;
+ }
+
+ public void setAccountState(Map<String, String> accountState) {
+ this.accountState = accountState;
+ }
+
+ public String getOrderOrigin() {
+ return orderOrigin;
+ }
+
+ public void setOrderOrigin(String orderOrigin) {
+ this.orderOrigin = orderOrigin;
+ }
+
+ public BigDecimal getTotalPayment() {
+ return totalPayment;
+ }
+
+ public void setTotalPayment(BigDecimal totalPayment) {
+ this.totalPayment = totalPayment;
+ }
+
}
--
Gitblit v1.8.0