From e8bba077c22ca0507b21d463dc9ec2ac922835de Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 22 十一月 2023 17:22:00 +0800
Subject: [PATCH] Merge branch 'rx-1116-营销生日券' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 8 ++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponProjectDto.java | 27 +++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 13 ++++--
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java | 6 +--
phis-feign/src/main/java/com/hz/his/dto/coupon/UserDelayCouponDto.java | 23 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java | 5 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 8 ++++
7 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
index 50eccc8..4aa8246 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
@@ -5,8 +5,6 @@
import java.math.BigDecimal;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
/**
* 浼樻儬鍒告柊澧炲弬鏁�
@@ -16,11 +14,11 @@
/**浼樻儬鍒告爣棰� */
private String title;
/**鐢宠绫诲瀷**/
- private Integer type;
+ private String type;
/**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=鎸囧畾 1=閫氱敤 **/
private Integer useProjectType;
/**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 ID,name **/
- private List<Map<String,Object>> serviceIds;
+ private List<CouponProjectDto> serviceIds;
/**闂ㄥ簵ID*/
private String shopId;
/**绱鐢宠鏁伴噺*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponProjectDto.java
new file mode 100644
index 0000000..1b2f6e4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponProjectDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.coupon;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+
+/**
+ * 浼樻儬鍒告柊澧� 椤圭洰鍙傛暟
+ */
+@Data
+public class CouponProjectDto extends PageDto {
+ /**id */
+ private String id;
+ /**椤圭洰鍚嶇О**/
+ private String name;
+ /**hisId**/
+ private String hisId;
+ /**hisType**/
+ private String hisType;
+
+ public CouponProjectDto(String id, String name, String hisId, String hisType) {
+ this.id = id;
+ this.name = name;
+ this.hisId = hisId;
+ this.hisType = hisType;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/UserDelayCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/UserDelayCouponDto.java
new file mode 100644
index 0000000..8f60cab
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/UserDelayCouponDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+@Data
+public class UserDelayCouponDto {
+
+ /**鐢ㄦ埛浼樻儬鍒窱D*/
+ private String couponNumberId;
+ /**鐢ㄦ埛ID*/
+ private String userId;
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String opEmployeeId;
+ /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+ private String opShopId;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+ /**澶囨敞*/
+ private String remarks;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
index 3ca5adc..817a7da 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -59,7 +59,10 @@
private String platform;
/**鍒楄〃鐘舵��:0鍏ㄩ儴1鏈娇鐢�2宸蹭娇鐢�3宸茶繃鏈�*/
private Integer listStatus;
-
+ /**鍒楄〃鐘舵��: 鏄惁杩囨护鐢熸棩鍒� */
+ private Integer isBirthday;
+ /**鍒楄〃鐘舵��:鏄惁鐘舵�佸閫�*/
+ private Integer isStatus;
/**棰嗗彇绫诲瀷-鏈煡*/
public static Integer C_TYPE_UNKNOW = -1;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 0fc8854..01f8bca 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -156,4 +156,12 @@
@PostMapping(value = "/coupon/usable/project/list")
Result couponUsableProjectList(@RequestBody(required = false) CouponDto dto);
+ /***
+ * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 鏄惁鏈変粖骞村彂鏀炬寚瀹氱殑鐢熸棩鍒�
+ */
+ @PostMapping(value = "/coupon/birthday/list/user")
+ Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
+
+
+
}
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 5c118f0..1383bdd 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
@@ -350,4 +350,12 @@
* */
@PostMapping(value = "/user/room/list")
Result userRoomList(@RequestBody UserDto userDto);
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 宸茬粡杩囨湡鍜屾湭杩囨湡鐨勪笖杩囨护鐢熸棩鍒�
+ * */
+ @PostMapping(value = "/user/coupon/by/valid/state")
+ Result userCouponByValidState(@RequestBody UserCouponDto userCouponDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index 859ef9e..412adb3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -1,10 +1,9 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.coupon.CouponAddDto;
-import com.hz.his.dto.coupon.CouponDto;
-import com.hz.his.dto.coupon.CouponSendDto;
-import com.hz.his.dto.coupon.OrderSendCouponDto;
+import com.hz.his.dto.coupon.*;
+import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -83,4 +82,10 @@
@PostMapping(value = "/coupon/check/surplus/num")
Result checkCouponSurplusNum(@RequestBody CouponDto couponDto);
+ /**
+ * 寮�鏀惧钩鍙�- 寤舵湡鐢ㄦ埛浼樻儬鍒�
+ */
+ @PostMapping(value = "/user/coupon/delay/coupon")
+ Result delayUserCoupon(@RequestBody UserDelayCouponDto userDelayCouponDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0