From c38f1ddb5247e24f3ea19c7b6890f80068ffe28f Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 27 四月 2023 14:49:33 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 be84009..316bc8e 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,14 +1,15 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
-import com.hz.his.dto.coupon.CouponDto;
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;
@@ -254,4 +255,26 @@
@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);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
+ * @param userDto userId
+ * @return
+ */
+ @PostMapping(value = "/user/check/member")
+ Result checkMember(@RequestBody UserDto userDto);
}
\ No newline at end of file
--
Gitblit v1.8.0