From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 338 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 292 insertions(+), 46 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 5a345a5..7fd7395 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
@@ -9,6 +9,7 @@
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
/**
* 璁㈠崟-绠�鐗�
@@ -21,54 +22,150 @@
public class CommonOrderVO extends CommonOrder implements Serializable {
private static final long serialVersionUID = 1L;
-
- // 鍒拌处鏃堕棿
- private Date accountTime;
- // 棰勮鍒拌处鏃堕棿
- private Date preAccountTime;
- // 瀹為檯鎬绘暟閲�
- private Integer totalCount;
- // 瀹為檯鎬讳粯娆�
- private BigDecimal totalSettlement;
- // 绾㈠寘绫诲瀷锛�
- private Integer hongBaoType;
- // 璁㈠崟鎬婚浼板閲�
- private BigDecimal hongBao;
-
- // 璁㈠崟鐘舵�� 1 娣樺疂 2 澶╃尗
- @Expose
- private Integer orderType;
- // 绾㈠寘鐘舵��
- @Expose
- private Integer hongBaoState;
- // 鍒拌处鏃堕棿
- @Expose
- private String hongBaoDate;
+
+ // 鍒拌处鏃堕棿
+ private Date accountTime;
+ // 棰勮鍒拌处鏃堕棿
+ private Date preAccountTime;
+ // 瀹為檯鎬绘暟閲�
+ private Integer totalCount;
+ // 瀹為檯鎬讳粯娆�
+ private BigDecimal totalPayment;
+ // 瀹為檯鎬荤粨绠�
+ private BigDecimal totalSettlement;
+ // 绾㈠寘绫诲瀷锛�
+ private Integer hongBaoType;
+ // 璁㈠崟鎬婚浼板閲�
+ private BigDecimal hongBao;
+
+ // 鍒哥孩鍖呴噾棰�
+ @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 hongBaoTypePic;
+ // 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
+ @Expose
+ private String orderOrigin;
// 璁㈠崟鐘舵��
- @Expose
- private Map<String, String> orderState;
- // 绾㈠寘閲戦
- @Expose
- private Map<String, String> hongBaoInfo;
+ @Expose
+ private Map<String, String> orderState;
+ // 绾㈠寘閲戦
+ @Expose
+ private Map<String, String> hongBaoInfo;
// 鍒拌处鐘舵��
- @Expose
- private Map<String, String> accountState;
- // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
- @Expose
- private Long obtainTime;
- // 涓嬪崟鏃堕棿
- @Expose
- private String downTime;
- // 鏀惰揣鏃堕棿
- @Expose
- private String receiveTime;
- // 璁㈠崟涓嬬殑鍟嗗搧
- @Expose
+ @Expose
+ private Map<String, String> accountState;
+ // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
+ @Expose
+ private Long obtainTime;
+ // 涓嬪崟鏃堕棿
+ @Expose
+ private String downTime;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private String receiveTime;
+ // 璁㈠崟涓嬬殑鍟嗗搧
+ @Expose
private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
+ // 璁㈠崟鐘舵�佸垪琛�
+ @Expose
+ private List<String> signList;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private Map<String, Object> rewardDetail;
+
+ // 缁存潈淇℃伅
+ @Expose
+ private WeiQuanInfo weiQuanInfo;
+
+ // 琛ヨ创淇℃伅
+ @Expose
+ private ClientTextStyleVO subsidy;
+ // 琛ヨ创瑙ｉ噴淇℃伅
+ @Expose
+ private List<String> subsidyList;
+
+ // 鐩存帴鏀剁泭浜�-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;// 缁存潈璧勯噾
+
+ private Integer otherState; // 1鍏嶅崟
+
+ @Expose
+ private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�(2.1涔嬪悗搴熷純)
+
+ @Expose
+ private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪(2.1涔嬪悗搴熷純)
+
+ @Expose
+ private String rebateLink;// 杩斿埄璇存槑閾炬帴
+
+ @Expose
+ private String orderDesc;// 璁㈠崟鎻忚堪
+
+
+ public String getVipOrderDesc() {
+ return vipOrderDesc;
+ }
+
+ public void setVipOrderDesc(String vipOrderDesc) {
+ this.vipOrderDesc = vipOrderDesc;
+ }
+
+ public boolean isVipOrder() {
+ return vipOrder;
+ }
+
+ public void setVipOrder(boolean vipOrder) {
+ this.vipOrder = vipOrder;
+ }
+
+ 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;
@@ -125,7 +222,6 @@
public void setReceiveTime(String receiveTime) {
this.receiveTime = receiveTime;
}
-
public List<CommonOrderGoodsVO> getListOrderGoods() {
return listOrderGoods;
@@ -191,7 +287,6 @@
this.hongBaoDate = hongBaoDate;
}
-
public Integer getOrderType() {
return orderType;
}
@@ -208,5 +303,156 @@
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;
+ }
+
+ public Integer getOtherState() {
+ return otherState;
+ }
+
+ public void setOtherState(Integer otherState) {
+ this.otherState = otherState;
+ }
+
+ public WeiQuanInfo getWeiQuanInfo() {
+ return weiQuanInfo;
+ }
+
+ public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {
+ this.weiQuanInfo = weiQuanInfo;
+ }
+
+ public ClientTextStyleVO getSubsidy() {
+ return subsidy;
+ }
+
+ public void setSubsidy(ClientTextStyleVO subsidy) {
+ this.subsidy = subsidy;
+ }
+
+ public List<String> getSubsidyList() {
+ return subsidyList;
+ }
+
+ public void setSubsidyList(List<String> subsidyList) {
+ this.subsidyList = subsidyList;
+ }
+
+ public String getOrderDesc() {
+ return orderDesc;
+ }
+
+ public void setOrderDesc(String orderDesc) {
+ this.orderDesc = orderDesc;
+ }
+
+ public String getRebateLink() {
+ return rebateLink;
+ }
+
+ public void setRebateLink(String rebateLink) {
+ this.rebateLink = rebateLink;
+ }
+
}
--
Gitblit v1.8.0