From ec23eaeb3e4e961012615cef296b89b2535673a5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 17:42:46 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 1 +
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java | 38 ++++++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java | 18 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 3 ++-
4 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 12eb2dc..3140fc7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -53,6 +53,7 @@
private Integer isTmk = 0;
/**鏄惁鏌ヨ骞撮緞:0鍚�1鏄�*/
private Integer isYear = 0;
-
+ /**鏄惁鏌ヨ浼樻儬鍒镐俊鎭�,0鍚�1鏄�*/
+ private Integer isSelectCoupon = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index d938304..a5d0a5c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -387,6 +387,7 @@
/**
* 鏌ヨ鐢ㄦ埛VIP璁板綍浠ュ強瑕侀鍙栫殑浼樻儬鍒�,浼爑serId瀛楁
+ * 杩斿洖瀹炰綋杞崲 UserCouponDataVo
* */
@PostMapping(value = "/user/vip/log/coupon")
Result userVipLogCoupon(@RequestBody UserDto userDto);
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
new file mode 100644
index 0000000..a4530e0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
@@ -0,0 +1,38 @@
+package com.hz.his.vo.user;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class UserCouponDataVo {
+ /**娲诲姩鍞竴缂栫爜activity-ken*/
+ private String uniqueNo;
+ /**娲诲姩寮�濮嬫椂闂�*/
+ private Date startTime;
+ /**娲诲姩缁撴潫鏃堕棿*/
+ private Date endTime;
+
+ /**鐢ㄦ埛phis鏍囪瘑*/
+ private String userId;
+ /**鏄惁鏇剧粡鍜岀幇鍦ㄦ槸vip瀹㈡埛* */
+ private Boolean isVip = false;
+
+ /**鎸囧畾鐨凷KU*/
+ private List<UserCouponSkuVo> skuList;
+ /**鍔犺喘鎸囧畾鐨凷KU*/
+ private List<UserCouponSkuVo> addSkuList;
+
+ /**鏄惁宸查鍙�,榛樿鍙鍙栦竴娆�*/
+ private Boolean isReceive = true;
+ /**瑕侀鍙栫殑浼樻儬鍒告爣璇�*/
+ private String couponId;
+ /**鍔犺喘缁撹处鍚庤禒閫佺殑浼樻儬鍒告爣璇�*/
+ private String sendCouponId;
+
+
+ /**瑕侀鍙栫殑浼樻儬鍒镐俊鎭�*/
+ private Map<String, Object> couponMap;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java
new file mode 100644
index 0000000..17a19c3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.vo.user;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * SKU瀹炰綋-鐑帥鍚夋椿鍔�
+ * */
+@Data
+public class UserCouponSkuVo {
+
+ /**sku鏍囪瘑*/
+ private String skuId;
+ /**sku鍚嶇О*/
+ private String skuName;
+
+}
--
Gitblit v1.8.0