From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 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 8863d6e..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
@@ -257,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);
+
/**
* 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -333,4 +340,56 @@
* */
@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