From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 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 ab4bd11..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
@@ -19,6 +19,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@@ -255,6 +257,13 @@
@PostMapping(value = "/user/crowd/import")
Result userCrowdImport(@RequestBody UserDto userDto);
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ */
+ @PostMapping(value = "/user/crowd/import/new")
+ Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);
+
/**
* 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -269,6 +278,12 @@
*/
@PostMapping(value = "/user/info/baseInfo")
Result userInfoBaseInfo(@RequestParam("userId") String userId);
+
+ /**
+ * 鑾峰彇鍒扮敤鎴�
+ */
+ @PostMapping(value = "/user/sync/by/idList")
+ Result userSyncList(@RequestBody List<String> hisIdList);
/**
* 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
@@ -319,4 +334,62 @@
* */
@PostMapping(value = "/user/rebate/userId")
Result queryRebateByUserId(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @PostMapping(value = "/user/query/oldNewPerformance")
+ Result queryOldNewPerformance(@RequestBody UserDto userDto);
+
+
+ @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);
+
}
\ No newline at end of file
--
Gitblit v1.8.0