From 0a21e1e41addd1800f5f0e177f5a28e8ba68c39a Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 06 三月 2024 16:01:06 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 2 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 0e9fc67..837a5dd 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,11 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
+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 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;
@@ -82,6 +84,60 @@
     /**
      * 鐢ㄦ埛鍏虫敞浜у搧璁板綍
      */
-    @PostMapping("/attention/product/edit")
-    Result userAttentionProductRecord(@RequestBody UserAttentionProductDto userAttentionProductDto);
+    @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/common/approve/create")
+    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0