From becc7f3f5f3e424a02deaa1a5849f830d6ed7da7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 18:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
index def0685..1b3a0d7 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
@@ -3,6 +3,8 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
@Data
public class UserCouponDataVo {
@@ -12,24 +14,28 @@
private Date startTime;
/**娲诲姩缁撴潫鏃堕棿*/
private Date endTime;
-
/**鐢ㄦ埛phis鏍囪瘑*/
private String userId;
- /**鏄惁鏇剧粡鍜岀幇鍦ㄦ槸vip瀹㈡埛* */
- private Boolean isVip = false;
- /**鎸囧畾鐨凷KU(鑹捐姱鑽熺殑id)* */
- private String skuId;
- /**鍔犺喘鐨凷KU(鑹捐姱鑽熺殑id)* */
- private String addSkuId;
+ /**鎸囧畾鐨凷KU*/
+ private List<UserCouponSkuVo> skuList;
+ /**鍔犺喘鎸囧畾鐨凷KU*/
+ private List<UserCouponSkuVo> addSkuList;
+
+ /**鎸囧畾鐨勫晢鍝�*/
+ private List<UserCouponGoodsVo> goodsList;
+ /**鍔犺喘鎸囧畾鐨勫晢鍝�*/
+ private List<UserCouponGoodsVo> addGoodsList;
/**鏄惁宸查鍙�,榛樿鍙鍙栦竴娆�*/
private Boolean isReceive = true;
+ /**璧犻�佷紭鎯犲埜绫诲瀷:0鏃�,1璧犻�佸ぇ棰�(5000),2璧犻�佸皬棰�(2500)*/
+ private Integer sendType = 0;
/**瑕侀鍙栫殑浼樻儬鍒告爣璇�*/
private String couponId;
/**鍔犺喘缁撹处鍚庤禒閫佺殑浼樻儬鍒告爣璇�*/
private String sendCouponId;
-
-
+ /**瑕侀鍙栫殑浼樻儬鍒镐俊鎭�*/
+ private Map<String, Object> couponMap;
}
--
Gitblit v1.8.0