From 0fe1b32aace6a0810c8f0ff5bbcbeb710fd52f37 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 25 七月 2024 11:56:50 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-秒杀日历
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 199 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 192 insertions(+), 7 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 a8f13f3..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
@@ -1,21 +1,25 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserAppointmentDto;
-import com.hz.his.dto.user.UserDto;
-import com.hz.his.dto.user.UserLevelDto;
+import com.hz.his.dto.user.*;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
+import com.hz.his.dto.user.coupon.GoodsUsedCouponDto;
+import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
-import com.hz.his.dto.user.money.*;
import com.hz.his.dto.user.label.UserLabelDto;
+import com.hz.his.dto.user.money.*;
+import com.hz.his.dto.user.packages.UserPhisPackageDto;
import com.hz.his.dto.user.project.UserProjectDto;
import com.hz.his.dto.user.project.UserProjectUsedDto;
+import com.hz.his.dto.user.promotion.UserPromotionUsedDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -28,6 +32,12 @@
* */
@PostMapping(value = "/user/list")
Result userList(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃
+ * */
+ @PostMapping(value = "/user/list/ids")
+ Result userIdList(@RequestBody UserDto userDto);
/**
* 鑾峰彇鍒扮敤鎴疯鎯�
@@ -86,10 +96,9 @@
/**
* 鑾峰彇鐢ㄦ埛淇冮攢浣跨敤璁板綍
- * @param orderItemNo 瀛愯鍗曞彿
* */
@PostMapping(value = "/user/promotion/used")
- Result userPromotionUsed(@RequestParam("orderItemNo") String orderItemNo);
+ Result userPromotionUsed(@RequestBody UserPromotionUsedDto userPromotionUsedDto);
/**
@@ -110,6 +119,19 @@
* */
@PostMapping(value = "/user/can/use/coupon")
Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
+
+ /**
+ * 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒�
+ * */
+ @PostMapping(value = "/goods/can/use/coupon")
+ Result goodsCanUseCoupon(@RequestBody GoodsUsedCouponDto goodsUsedCouponDto);
+
+ /**
+ * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
+ * 杞寲浣跨敤 CouponNumberDto
+ */
+ @PostMapping(value = "/order/can/use/coupon")
+ Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto);
/**
@@ -151,9 +173,10 @@
/**
* 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
+ * 杩斿洖浣跨敤UserHaveDt
* */
@PostMapping(value = "/user/have/count")
- Result userHaveCount(@RequestParam("userId") String userId);
+ Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
/**
@@ -207,4 +230,166 @@
@PostMapping(value = "/user/appearance/info")
Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
+ /**
+ * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
+ * */
+ @PostMapping(value = "/user/package/list")
+ Result userPackageList(@RequestBody UserPhisPackageDto userPhisPackageDto);
+
+ /**鏍规嵁鏍囪瘑闆嗗悎绛涢�夌敤鎴�*/
+ @PostMapping(value = "/user/idList/list")
+ Result userIdSelectList(@RequestBody UserIdsDto userIdsDto);
+
+ /**鑾峰彇鐢ㄦ埛淇℃伅锛岀煭淇℃ā鏉夸笓鐢�
+ * 鑾峰彇鏍规嵁id鎴栬�匔IQ鎴栬�卙isId鏌ユ壘鐢ㄦ埛
+ * @param userDto 鍙娇鐢╥d鍜孋IQ
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/sms-find")
+ Result userSms(@RequestBody UserDto userDto);
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ * @param userDto 鍙娇鐢╪ame鍜孋IQ
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/crowd/import")
+ Result userCrowdImport(@RequestBody UserDto userDto);
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ */
+ @PostMapping(value = "/user/crowd/import/new")
+ Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
+ */
+ @PostMapping(value = "/user/project/items")
+ Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);
+
+ /**
+ * 鑾峰彇鍒扮敤鎴疯鎯�(鍚屾浣跨敤)
+ * @param userId 鐢ㄦ埛鏍囪瘑
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/info/baseInfo")
+ Result userInfoBaseInfo(@RequestParam("userId") String userId);
+
+ /**
+ * 鑾峰彇鍒扮敤鎴�
+ */
+ @PostMapping(value = "/user/sync/by/idList")
+ Result userSyncList(@RequestBody List<String> hisIdList);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
+ * @param userDto userId
+ * @return
+ */
+ @PostMapping(value = "/user/check/member")
+ Result checkMember(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浼氬憳绛夌骇涓嬩竴绾�
+ * */
+ @PostMapping(value = "/user/next/level")
+ Result nextLevel(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ绱杩斾剑
+ * */
+ @PostMapping(value = "/user/query/rebate")
+ Result queryRebate(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/first/day/consumption")
+ Result firstDayConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/accumulat/consumption")
+ Result accumulateConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/upgraded/aesthetics")
+ Result checkUpgradedAesthetics(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/consumption")
+ Result checkConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @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