From 9613599e14008991485ac021d591fc48606050d6 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 09 五月 2024 19:01:50 +0800
Subject: [PATCH] Merge branch 'fhx-prod-0506电子签修改' into master-prod-new

---
 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