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/SUserService.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 5c118f0..352df2b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -24,7 +24,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "user")
 public interface SUserService {
 
     /**
@@ -350,4 +350,46 @@
      * */
     @PostMapping(value = "/user/room/list")
     Result userRoomList(@RequestBody UserDto userDto);
+
+
+    /**
+     * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 宸茬粡杩囨湡鍜屾湭杩囨湡鐨勪笖杩囨护鐢熸棩鍒�
+     * */
+    @PostMapping(value = "/user/coupon/by/valid/state")
+    Result userCouponByValidState(@RequestBody UserCouponDto userCouponDto);
+
+
+    /**
+     * 鐢ㄦ埛浼樻儬鍒稿垪琛� 鑾峰彇璁㈠崟鍏ㄩ閫�娆�-閫�鍥炲凡杩囨湡浼樻儬鍒�
+     * */
+    @PostMapping(value = "/user/refund/order/overdue/coupon")
+    Result userRefundOrderOverdueCoupon(@RequestBody UserCouponDto userCouponDto);
+
+    /**
+     * 鐢ㄦ埛鐐硅瘖鍖荤敓璁板綍
+     * */
+    @PostMapping(value = "/user/doctor/data/list")
+    Result userDoctorDataList(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛骞村害璐﹀崟
+     * */
+    @PostMapping(value = "/user/statement/details")
+    Result statementDetails(@RequestBody UserDto userDto);
+
+
+    /**
+     * 鏌ヨ鐢ㄦ埛鏈�鏂扮殑鍚堝苟璐﹀彿璁板綍
+     * */
+    @PostMapping(value = "/user/merge/log")
+    Result userMergeLog(@RequestBody UserDto userDto);
+
+
+    /**
+     * 鏌ヨ鐢ㄦ埛VIP璁板綍浠ュ強瑕侀鍙栫殑浼樻儬鍒�,浼爑serId瀛楁
+     * 杩斿洖瀹炰綋杞崲 UserCouponDataVo
+     * */
+    @PostMapping(value = "/user/vip/log/coupon")
+    Result userVipLogCoupon(@RequestBody UserDto userDto);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0