From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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..c53c4c5 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,22 @@
@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 = "/coupon/birthday/list/user")
+ Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
/**
- * 鏌ヨ浼樻儬鍒稿墿浣欐暟閲� 澶氫釜
+ * 鑾峰彇浼樻儬鍒搁鍙栬鍒欏垪琛�
*/
- @PostMapping(value = "/check/coupon/surplus/num")
- Result checkCouponSurplusNum(@RequestBody(required = false) CouponDto dto);
+ @PostMapping(value = "/coupon/receive/rule/list")
+ Result getReceiveRuleList();
}
--
Gitblit v1.8.0