From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 9a62235..a6c64aa 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
@@ -40,7 +40,7 @@
  	// 鍒哥孩鍖呴噾棰�
  	@Expose
  	private BigDecimal couponMoney;
- 	//   1 娣樺疂 2 澶╃尗
+ 	// 1 娣樺疂 2 澶╃尗
   	@Expose
     private Integer orderType;
  	// 绾㈠寘鐘舵��
@@ -52,7 +52,7 @@
 	// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
  	@Expose
  	private String hongBaoTypePic;
- 	// 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+ 	// 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
   	@Expose
     private String orderOrigin;
 	// 璁㈠崟鐘舵��
@@ -84,6 +84,10 @@
     @Expose
     private Map<String, Object> rewardDetail;
     
+    // 缁存潈淇℃伅
+    @Expose
+    private WeiQuanInfo weiQuanInfo;
+   
     
     
     // 鐩存帴鏀剁泭浜�-ID
@@ -109,6 +113,8 @@
  	private String weiQuanState;//缁存潈鐘舵��
  	
  	private String weiQuanBackMoney;//缁存潈璧勯噾
+ 	
+ 	private Integer otherState; // 1鍏嶅崟
     
 	public String getWeiQuanState() {
 		return weiQuanState;
@@ -369,4 +375,19 @@
 		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;
+	}
 }

--
Gitblit v1.8.0