From 553e4585a5ec8e2c22b50e33a27d14ead6fd034d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 26 四月 2019 15:16:07 +0800
Subject: [PATCH] 店铺足迹删除+ 假删除
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 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..270b65e 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;
@@ -82,6 +93,9 @@
// 鐩存帴鏀剁泭浜�-澶村儚
private String userPortrait; // 澶村儚
+ // 绾㈠寘ID
+ private Long hongbaoId;
+
// 涓�绾ф敹鐩婁汉-ID
private String levelOneId;
// 涓�绾ф敹鐩婁汉-閲戦
@@ -304,4 +318,37 @@
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;
+ }
+
}
--
Gitblit v1.8.0