From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 54 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 77ac4ed..e8db8bc 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
@@ -344,4 +344,58 @@
 
     @PostMapping(value = "/user/draw/list")
     Result drawGetUserDt(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛绉戝鍏崇郴
+     * */
+    @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);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛璐拱杩囩殑椤圭洰
+     * */
+    @PostMapping(value = "/user/buy/sku/logList")
+    Result getUserBuySkuList(@RequestBody UserDto userDto);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0