From fcfc7c0510592aade38d4ef84070e0445964334c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 01 四月 2024 18:57:06 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 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 1383bdd..a5d0a5c 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
@@ -358,4 +358,38 @@
     @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