From fac8dcce1d2cad6728270b436952f818378fc6ea Mon Sep 17 00:00:00 2001
From: 喻健 <Administrator@Admin>
Date: 星期二, 25 十二月 2018 15:12:32 +0800
Subject: [PATCH] 订单状态调整
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 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..c6dce41 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
@@ -37,7 +37,9 @@
// 绾㈠寘鐘舵��
private Integer hongBaoState;
-
+ // 鍒拌处鏃堕棿
+ @Expose
+ private String hongBaoDate;
// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
@Expose
private String hongBaoTypePic;
@@ -49,7 +51,7 @@
private Map<String, String> hongBaoInfo;
// 鍒拌处鐘舵��
@Expose
- private Map<String, String> accountState;
+ private String accountState;
// 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
@Expose
private Long obtainTime;
@@ -59,12 +61,6 @@
// 鏀惰揣鏃堕棿
@Expose
private String receiveTime;
- // 鍒拌处鏃堕棿
- @Expose
- private String getTime;
- // 棰勮鍒拌处鏃堕棿
- @Expose
- private String preGetTime;
// 璁㈠崟涓嬬殑鍟嗗搧
@Expose
private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
@@ -126,21 +122,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 +163,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 +179,21 @@
this.orderState = orderState;
}
+ public String getHongBaoDate() {
+ return hongBaoDate;
+ }
+
+ public void setHongBaoDate(String hongBaoDate) {
+ this.hongBaoDate = hongBaoDate;
+ }
+
+ public String getAccountState() {
+ return accountState;
+ }
+
+ public void setAccountState(String accountState) {
+ this.accountState = accountState;
+ }
+
}
--
Gitblit v1.8.0