From bceee99e4493c359e2c0872e4076d3db95718b71 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 94 insertions(+), 6 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 e076a63..fa030f6 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,13 +1,12 @@
 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.UserMergeDto;
-import com.hz.his.dto.user.UserParamDto;
-import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.marketing.common.MarCommonReturnDto;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import com.hz.his.dto.user.*;
 import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.project.UserProjectDto;
-import feign.Request;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
 import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -75,6 +74,95 @@
      * 鐢ㄦ埛鍗囩骇杩涘害
      */
     @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);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍙戦�佽幏瀹㈡秷鎭坊鍔犲鎴�
+     */
+    @PostMapping(value = "/user/acquisition/sent")
+    Result sentUserAcquisitionSMS(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鑾峰鏁版嵁璁板綍
+     */
+    @PostMapping(value = "/user/acquisition/list")
+    Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖鏂板
+     */
+    @PostMapping(value = "/user/room/doctor/diagnosis/create")
+    Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖瀹℃牳鍥炶皟
+     */
+    @PostMapping(value = "user/room/doctor/diagnosis")
+    Result diagnosisFamiliesRoom(@RequestBody MarCommonReturnDto marCommonReturnDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖褰撴湀閫氳繃娆℃暟
+     */
+    @PostMapping(value = "user/room/doctor/diagnosis/count")
+    Result diagnosisFamiliesRoomCount(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
+     */
+    @PostMapping(value = "/user/common/approve/create")
+    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
+
+    /**
+     * 鍒拌鏇存柊鐢ㄦ埛淇℃伅
+     */
+    @PostMapping(value = "/user/arrive/edit")
+    Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍛樺伐鑾峰彇鑾峰彇鐭俊鍐呭閾炬帴
+     */
+    @PostMapping(value = "/user/acquisition/get/link")
+    Result getUserAcquisitionLink(@RequestBody UserParamDto userParamDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0