From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 c6dce41..5924c5b 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
@@ -34,15 +34,22 @@
private Integer hongBaoType;
// 璁㈠崟鎬婚浼板閲�
private BigDecimal hongBao;
+
+ // 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;
@@ -51,7 +58,7 @@
private Map<String, String> hongBaoInfo;
// 鍒拌处鐘舵��
@Expose
- private String accountState;
+ private Map<String, String> accountState;
// 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
@Expose
private Long obtainTime;
@@ -187,13 +194,30 @@
this.hongBaoDate = hongBaoDate;
}
- public String getAccountState() {
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Map<String, String> getAccountState() {
return accountState;
}
- public void setAccountState(String accountState) {
+ public void setAccountState(Map<String, String> accountState) {
this.accountState = accountState;
}
+ public String getOrderOrigin() {
+ return orderOrigin;
+ }
+
+ public void setOrderOrigin(String orderOrigin) {
+ this.orderOrigin = orderOrigin;
+ }
+
}
--
Gitblit v1.8.0