From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index d35d70e..ca639b0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,9 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserListDto;
-import com.hz.his.dto.user.UserParamDto;
-import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
import net.sf.json.JSONObject;
@@ -73,6 +71,47 @@
* 鐢ㄦ埛鍗囩骇杩涘害
*/
@PostMapping("user/level/progress")
- Result userLevelProgress(@RequestBody JSONObject parmData);
+ Result userLevelProgress(@RequestBody JSONObject paramData);
+ /**
+ * 鐢ㄦ埛閭�璇蜂汉淇℃伅
+ */
+ @PostMapping("user/invitee/info")
+ Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto);
+
+ /**
+ * 鐢ㄦ埛鍏虫敞浜у搧璁板綍
+ */
+ @PostMapping("/attention/product/record/edit")
+ Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info")
+ Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-淇敼鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info/update")
+ Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
+ */
+ @PostMapping(value = "/user/level/calc")
+ Result userLevelCalc(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鐨勫叕浼楀彿淇℃伅
+ */
+ @PostMapping(value = "/user/gzh/info")
+ Result userGZHInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇crm灏忕▼搴忚烦杞摼鎺�
+ */
+ @PostMapping(value = "/user/crm/url/link")
+ Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);
}
\ No newline at end of file
--
Gitblit v1.8.0