From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |  167 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 132 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..5eb555e 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,29 @@
     // 瀹為檯鎬绘暟閲�
  	private Integer totalCount;
  	// 瀹為檯鎬讳粯娆�
- 	private BigDecimal totalSettlement;
+ 	private BigDecimal totalPayment;
+    // 瀹為檯鎬荤粨绠�
+  	private BigDecimal totalSettlement;
  	// 绾㈠寘绫诲瀷锛�
  	private Integer hongBaoType;
     // 璁㈠崟鎬婚浼板閲�
  	private BigDecimal hongBao;
- 	// 绾㈠寘鐘舵��
-    private Integer hongBaoState;
-   
  	
+ 	//   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 +60,7 @@
     private Map<String, String> hongBaoInfo;
 	// 鍒拌处鐘舵��
  	@Expose
-    private Map<String, String> accountState;
+ 	private Map<String, String> accountState;
     // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
     @Expose
     private Long obtainTime;
@@ -59,17 +70,30 @@
     // 鏀惰揣鏃堕棿
     @Expose
     private String receiveTime;
-    // 鍒拌处鏃堕棿
-    @Expose
-    private String getTime;
-    // 棰勮鍒拌处鏃堕棿
-    @Expose
-    private String preGetTime;
     // 璁㈠崟涓嬬殑鍟嗗搧
     @Expose
 	private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
 
+    
+    // 鐩存帴鏀剁泭浜�-ID
+   	private String userId;
+   	// 鐩存帴鏀剁泭浜�-鏄电О
+   	private String userName;
+	// 鐩存帴鏀剁泭浜�-澶村儚
+   	private String userPortrait; // 澶村儚
+   	
+    // 涓�绾ф敹鐩婁汉-ID
+ 	private String levelOneId;
+ 	// 涓�绾ф敹鐩婁汉-閲戦
+ 	private String levelOneMoney;
 
+ 	// 浜岀骇鏀剁泭浜�-ID
+ 	private String levelTwoId;
+ 	// 浜岀骇鏀剁泭浜�-閲戦
+ 	private String levelTwoMoney;
+ 	
+ 	
+    
 	public Date getAccountTime() {
 		return accountTime;
 	}
@@ -126,21 +150,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 +191,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 +207,101 @@
 		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;
+	}
+
 }

--
Gitblit v1.8.0