From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |   17 +++++++++++++++++
 1 files changed, 17 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 cb942aa..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,5 +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 = "/coupon/receive/rule/list")
+    Result getReceiveRuleList();
 
 }

--
Gitblit v1.8.0