From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
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 a7eac39..b2a1681 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
@@ -116,6 +116,13 @@
Result userCouponCheckList(@RequestBody(required = false) CouponListDto couponListDto);
/**
+ * 鐢ㄦ埛-鍗囧崟璁㈠崟鐨勫師浣跨敤浼樻儬鍒稿垪琛�
+ * @return canUseCouponList鍙敤鍒稿垪琛� canUseCount鍙敤鍒告暟閲�
+ * */
+ @PostMapping(value = "/coupon/user/riseOrderOriCouponList")
+ Result riseOrderOriCouponList(@RequestBody(required = false) CouponListDto couponListDto);
+
+ /**
* 鏍规嵁skuid鏌ヨ鍏宠仈浼樻儬鍒�
*/
@PostMapping(value = "/coupon/find/skuId")
@@ -142,4 +149,19 @@
*/
@PostMapping(value = "/couponType/list")
Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
+
+ /***
+ * 鏌ヨ浼樻儬鍒稿彲鐢ㄩ」鐩�
+ */
+ @PostMapping(value = "/coupon/usable/project/list")
+ Result couponUsableProjectList(@RequestBody(required = false) CouponDto dto);
+
+ /***
+ * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 鏄惁鏈変粖骞村彂鏀炬寚瀹氱殑鐢熸棩鍒�
+ */
+ @PostMapping(value = "/user/birthday/coupon/list")
+ Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
+
+
+
}
--
Gitblit v1.8.0