From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 232 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 197 insertions(+), 35 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..9a62235 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,32 @@
// 瀹為檯鎬绘暟閲�
private Integer totalCount;
// 瀹為檯鎬讳粯娆�
- private BigDecimal totalSettlement;
+ private BigDecimal totalPayment;
+ // 瀹為檯鎬荤粨绠�
+ private BigDecimal totalSettlement;
// 绾㈠寘绫诲瀷锛�
private Integer hongBaoType;
// 璁㈠崟鎬婚浼板閲�
private BigDecimal hongBao;
- // 绾㈠寘鐘舵��
- private Integer hongBaoState;
-
+ // 鍒哥孩鍖呴噾棰�
+ @Expose
+ private BigDecimal couponMoney;
+ // 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 +63,7 @@
private Map<String, String> hongBaoInfo;
// 鍒拌处鐘舵��
@Expose
- private Map<String, String> accountState;
+ private Map<String, String> accountState;
// 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
@Expose
private Long obtainTime;
@@ -59,16 +73,58 @@
// 鏀惰揣鏃堕棿
@Expose
private String receiveTime;
- // 鍒拌处鏃堕棿
- @Expose
- private String getTime;
- // 棰勮鍒拌处鏃堕棿
- @Expose
- private String preGetTime;
// 璁㈠崟涓嬬殑鍟嗗搧
@Expose
private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
+ // 璁㈠崟鐘舵�佸垪琛�
+ @Expose
+ private List<String> signList;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private Map<String, Object> rewardDetail;
+
+
+
+ // 鐩存帴鏀剁泭浜�-ID
+ private String userId;
+ // 鐩存帴鏀剁泭浜�-鏄电О
+ private String userName;
+ // 鐩存帴鏀剁泭浜�-澶村儚
+ private String userPortrait; // 澶村儚
+
+ // 绾㈠寘ID
+ private Long hongbaoId;
+
+ // 涓�绾ф敹鐩婁汉-ID
+ private String levelOneId;
+ // 涓�绾ф敹鐩婁汉-閲戦
+ private String levelOneMoney;
+
+ // 浜岀骇鏀剁泭浜�-ID
+ private String levelTwoId;
+ // 浜岀骇鏀剁泭浜�-閲戦
+ private String levelTwoMoney;
+
+ private String weiQuanState;//缁存潈鐘舵��
+
+ private String weiQuanBackMoney;//缁存潈璧勯噾
+
+ public String getWeiQuanState() {
+ return weiQuanState;
+ }
+
+ public void setWeiQuanState(String weiQuanState) {
+ this.weiQuanState = weiQuanState;
+ }
+
+ public String getWeiQuanBackMoney() {
+ return weiQuanBackMoney;
+ }
+
+ public void setWeiQuanBackMoney(String weiQuanBackMoney) {
+ this.weiQuanBackMoney = weiQuanBackMoney;
+ }
public Date getAccountTime() {
return accountTime;
@@ -126,21 +182,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 +223,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 +239,134 @@
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;
+ }
+
+ public String getLevelOneId() {
+ return levelOneId;
+ }
+
+ public void setLevelOneId(String levelOneId) {
+ this.levelOneId = levelOneId;
+ }
+
+ public String getLevelOneMoney() {
+ return levelOneMoney;
+ }
+
+ public void setLevelOneMoney(String levelOneMoney) {
+ this.levelOneMoney = levelOneMoney;
+ }
+
+ public String getLevelTwoId() {
+ return levelTwoId;
+ }
+
+ public void setLevelTwoId(String levelTwoId) {
+ this.levelTwoId = levelTwoId;
+ }
+
+ public String getLevelTwoMoney() {
+ return levelTwoMoney;
+ }
+
+ public void setLevelTwoMoney(String levelTwoMoney) {
+ this.levelTwoMoney = levelTwoMoney;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getUserPortrait() {
+ return userPortrait;
+ }
+
+ public void setUserPortrait(String userPortrait) {
+ this.userPortrait = userPortrait;
+ }
+
+
+ public Map<String, Object> getRewardDetail() {
+ return rewardDetail;
+ }
+
+ public void setRewardDetail(Map<String, Object> rewardDetail) {
+ this.rewardDetail = rewardDetail;
+ }
+
+ public List<String> getSignList() {
+ return signList;
+ }
+
+ public void setSignList(List<String> signList) {
+ this.signList = signList;
+ }
+
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
+
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
+
+ public Long getHongbaoId() {
+ return hongbaoId;
+ }
+
+ public void setHongbaoId(Long hongbaoId) {
+ this.hongbaoId = hongbaoId;
+ }
+
}
--
Gitblit v1.8.0