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 | 17 ++++++++++++++++-
1 files changed, 16 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 a9f3bc8..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 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "user")
public interface SUserService {
/**
@@ -377,4 +377,19 @@
@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