From dff9cfc66cdcb547578d99af6f5080dbdf902183 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 19:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 110943b..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
@@ -150,11 +150,18 @@
@PostMapping(value = "/couponType/list")
Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
-
- /**
- * 鏌ヨ浼樻儬鍒稿墿浣欐暟閲� 澶氫釜
+ /***
+ * 鏌ヨ浼樻儬鍒稿彲鐢ㄩ」鐩�
*/
- @PostMapping(value = "/check/coupon/surplus/num")
- Result checkCouponSurplusNum(@RequestBody(required = false) CouponDto dto);
+ @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);
+
+
}
--
Gitblit v1.8.0