From 971eb04d09d950f7fa0d534560a76dd69d84c69c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 dc62742..6ef35e1 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
@@ -14,7 +14,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "coupon")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "coupon")
public interface SCouponService {
/**
@@ -149,4 +149,23 @@
*/
@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