From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 203 ++++++++++++++++++++++++++------------------------
1 files changed, 105 insertions(+), 98 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 23e9a39..47dcf37 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
@@ -22,107 +22,117 @@
public class CommonOrderVO extends CommonOrder implements Serializable {
private static final long serialVersionUID = 1L;
-
- // 鍒拌处鏃堕棿
- 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;
+
+ // 鍒拌处鏃堕棿
+ 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 orderOrigin;
+ @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;
+ // 璁㈠崟鐘舵�佸垪琛�
+ @Expose
+ private List<String> signList;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private Map<String, Object> rewardDetail;
- // 浜岀骇鏀剁泭浜�-ID
- private String levelTwoId;
- // 浜岀骇鏀剁泭浜�-閲戦
- private String levelTwoMoney;
-
- private String weiQuanState;//缁存潈鐘舵��
-
- private String weiQuanBackMoney;//缁存潈璧勯噾
-
- private Integer otherState; // 1鍏嶅崟
-
+ // 缁存潈淇℃伅
+ @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;// 鏄惁涓鸿秴绾х敤鎴疯鍗�
+
+ public boolean isVipOrder() {
+ return vipOrder;
+ }
+
+ public void setVipOrder(boolean vipOrder) {
+ this.vipOrder = vipOrder;
+ }
+
public String getWeiQuanState() {
return weiQuanState;
}
@@ -195,7 +205,6 @@
this.receiveTime = receiveTime;
}
-
public List<CommonOrderGoodsVO> getListOrderGoods() {
return listOrderGoods;
}
@@ -259,7 +268,6 @@
public void setHongBaoDate(String hongBaoDate) {
this.hongBaoDate = hongBaoDate;
}
-
public Integer getOrderType() {
return orderType;
@@ -348,7 +356,6 @@
public void setUserPortrait(String userPortrait) {
this.userPortrait = userPortrait;
}
-
public Map<String, Object> getRewardDetail() {
return rewardDetail;
--
Gitblit v1.8.0