From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 2fb74de..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 {
 
     /**
@@ -371,4 +371,25 @@
     @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