From deb9ce158ab4d9bf8a897115fa4a3e37e54b9af1 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 25 七月 2022 12:07:27 +0800
Subject: [PATCH] 用户查询优化
---
phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java | 39 ++++--------
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 56 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 43 +-------------
3 files changed, 73 insertions(+), 65 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 9b58d74..9bfb10e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,53 +1,16 @@
package com.hz.his.dto.user;
+import com.hz.his.dto.PageDto;
import lombok.Data;
-import java.math.BigDecimal;
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@Data
-public class UserDto {
+public class UserDto extends PageDto {
private String id;
+ private String userId;
private String CIQ;
private String name;
private String tel;
- /**鐢熸棩yyyy-MM-dd*/
- private String birthDay;
- /**棰嗗缓绯荤粺鐨刬d*/
- private String apiId;
- /**鐢ㄦ埛浼氬憳鍚嶇О*/
- private String userLevel;
- /**鐢ㄦ埛浼氬憳绛夌骇缂栫爜*/
- private String hisNo;
- /**鐢ㄦ埛浼氬憳绛夌骇id*/
- private String memberLevelId;
- /**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
- private String memberName;
- /**鐢ㄦ埛浼氬憳绛夌骇鍥炬爣*/
- private String memberImg;
- /**鍌ㄥ�奸噾*/
- private BigDecimal storedValueFund;
- /**澧炲�奸噾*/
- private BigDecimal valueAddedFund;
- /**绉垎*/
- private BigDecimal integral;
- /**鏉ユ簮id,椤剁骇*/
- private String channelId;
- /**鏉ユ簮,椤剁骇*/
- private String channelType;
- /**浜岀骇鏉ユ簮id,鏈骇*/
- private String channel2Id;
- /**浜岀骇鏉ユ簮,鏈骇*/
- private String channelType2;
- /**閭�璇蜂汉id */
- private String inviteeId;
- /**娓犻亾鏉ユ簮绫诲瀷(UserChannelType) */
- private String channelCategory;
- /**鎵�灞為棬搴�*/
- private String shopId;
- /**鐢ㄦ埛瑙掕壊*/
- private String userRole;
- /**鐢ㄦ埛绫诲瀷*/
- private String userType;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
index 46c50c7..dad0174 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
@@ -24,33 +24,24 @@
public interface SUserService {
/**
- * 鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅
- * @param
+ * 鏌ヨ鐢ㄦ埛鍒楄〃
* */
- @PostMapping(value = "/user/info/basic")
- Result userBasicInfo(@RequestParam("userId") String userId);
+ @PostMapping(value = "/user/list")
+ Result userList(@RequestBody UserDto userDto);
/**
* 鑾峰彇鍒扮敤鎴疯鎯�
- * @param userId 棰勭害鐢ㄦ埛鏍囪瘑
+ * @param userId 鐢ㄦ埛鏍囪瘑
* @return 杞寲浣跨敤UserDt
*/
@PostMapping(value = "/user/info")
Result userInfo(@RequestParam("userId") String userId);
-
/**
- * 鏍规嵁鐢佃瘽鍙风爜鏌ヨ鐢ㄦ埛淇℃伅
- * @param tel
+ * 鑾峰彇鐢ㄦ埛璧勯噾淇℃伅
* */
- @PostMapping(value = "/user/info/tel")
- Result findUserInfoByTel(@RequestParam("tel") String tel);
-
- /**
- * 鏍规嵁鐢佃瘽鍙风爜鎴栬�匔IQ鑾峰彇鎸囧畾鐢ㄦ埛
- * */
- @PostMapping(value = "/user/info/telOrCiq")
- Result findUserByTelOrCiq(@RequestBody UserDto userDto);
+ @PostMapping(value = "/user/money/info")
+ Result userMoneyInfo(@RequestParam("userId") String userId);
/**
* 鑾峰彇鐢ㄦ埛椤圭洰
@@ -106,6 +97,13 @@
/**
+ * 鑾峰彇鐢ㄦ埛鍙敤浼樻儬鍒�
+ * */
+ @PostMapping(value = "/user/can/use/coupon")
+ Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
+
+
+ /**
* 鑾峰彇鐢ㄦ埛澧炲�奸噾鍒楄〃
* */
@PostMapping(value = "/user/increment/list")
@@ -144,17 +142,9 @@
/**
* 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
- * @param
* */
@PostMapping(value = "/user/have/count")
Result userHaveCount(@RequestParam("userId") String userId);
-
- /**
- * 鑾峰彇鐢ㄦ埛鍙敤浼樻儬鍒�
- * @param
- * */
- @PostMapping(value = "/user/can/use/coupon")
- Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
/**
@@ -167,7 +157,6 @@
/**
* 鑾峰彇鐢ㄦ埛娑堣垂鏁版嵁
- * @param
* */
@PostMapping(value = "/user/consume/count")
Result userConsumeCount(@RequestBody UserConsumeDto userConsumeDto);
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
new file mode 100644
index 0000000..b4437c1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -0,0 +1,56 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
+@Data
+public class UserDt {
+ /**鏍囪瘑*/
+ private String id;
+ /**ciq浼氬憳鍙�*/
+ private String CIQ;
+ /**鍚嶇О*/
+ private String name;
+ /**鎵嬫満鍙�*/
+ private String tel;
+ /**鐢熸棩yyyy-MM-dd*/
+ private String birthDay;
+ /**棰嗗缓绯荤粺鐨刬d*/
+ private String apiId;
+ /**鐢ㄦ埛浼氬憳鍚嶇О*/
+ private String userLevel;
+ /**鐢ㄦ埛浼氬憳绛夌骇缂栫爜*/
+ private String hisNo;
+ /**鐢ㄦ埛浼氬憳绛夌骇id*/
+ private String memberLevelId;
+ /**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
+ private String memberName;
+ /**鐢ㄦ埛浼氬憳绛夌骇鍥炬爣*/
+ private String memberImg;
+ /**鍌ㄥ�奸噾*/
+ private BigDecimal storedValueFund;
+ /**澧炲�奸噾*/
+ private BigDecimal valueAddedFund;
+ /**绉垎*/
+ private BigDecimal integral;
+ /**鏉ユ簮id,椤剁骇*/
+ private String channelId;
+ /**鏉ユ簮,椤剁骇*/
+ private String channelType;
+ /**浜岀骇鏉ユ簮id,鏈骇*/
+ private String channel2Id;
+ /**浜岀骇鏉ユ簮,鏈骇*/
+ private String channelType2;
+ /**閭�璇蜂汉id */
+ private String inviteeId;
+ /**娓犻亾鏉ユ簮绫诲瀷(UserChannelType) */
+ private String channelCategory;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+ /**鐢ㄦ埛瑙掕壊*/
+ private String userRole;
+ /**鐢ㄦ埛绫诲瀷*/
+ private String userType;
+}
--
Gitblit v1.8.0