From 415acae4b59fa45ddea9297c324030eba4ea69f7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 06 十二月 2022 16:32:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 d0d44b7..fa0720e 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,16 +1,15 @@
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.UserIdsDto;
-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.*;
-import com.hz.his.dto.user.money.*;
+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.label.UserLabelDto;
-import com.hz.his.dto.user.packages.UserPackageDto;
+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;
@@ -31,6 +30,12 @@
* */
@PostMapping(value = "/user/list")
Result userList(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃
+ * */
+ @PostMapping(value = "/user/list/ids")
+ Result userIdList(@RequestBody UserDto userDto);
/**
* 鑾峰彇鍒扮敤鎴疯鎯�
@@ -166,9 +171,10 @@
/**
* 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
+ * 杩斿洖浣跨敤UserHaveDt
* */
@PostMapping(value = "/user/have/count")
- Result userHaveCount(@RequestParam("userId") String userId);
+ Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
/**
@@ -240,4 +246,27 @@
@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);
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
+ */
+ @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);
}
\ No newline at end of file
--
Gitblit v1.8.0