From 8b37d2f16d4aa7c7ce19829b74307ae0072b127f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 二月 2019 10:44:55 +0800
Subject: [PATCH] 1.5.1  奖励券、免单券

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 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 5eb555e..de80ceb 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
@@ -37,6 +37,9 @@
     // 璁㈠崟鎬婚浼板閲�
  	private BigDecimal hongBao;
  	
+ 	// 鍒哥孩鍖呴噾棰�
+ 	@Expose
+ 	private BigDecimal couponMoney;
  	//   1 娣樺疂 2 澶╃尗
   	@Expose
     private Integer orderType;
@@ -74,6 +77,14 @@
     @Expose
 	private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
 
+    // 璁㈠崟鐘舵�佸垪琛�
+    @Expose
+    private List<String> signList;
+    // 鏀惰揣鏃堕棿
+    @Expose
+    private Map<String, Object> rewardDetail;
+    
+    
     
     // 鐩存帴鏀剁泭浜�-ID
    	private String userId;
@@ -304,4 +315,29 @@
 		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;
+	}
+
 }

--
Gitblit v1.8.0