From 091a21654aa3a3effdcf0a3a3fbf982e6e4a9e99 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 14 十一月 2023 14:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   86 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 81 insertions(+), 5 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 a66d934..ad56d0c 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,11 +1,10 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.token.GetTokenDto;
-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;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,6 +14,20 @@
  */
 @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user")
 public interface SPhipUserService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍒楄〃
+     * 杩斿洖瀹炰綋鐢║serPhipDt
+     */
+    @PostMapping(value = "/user/list")
+    Result userList(@RequestBody UserListDto userListDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-绮剧‘鑾峰彇鐢ㄦ埛鍒楄〃
+     * 杩斿洖瀹炰綋鐢║serPhipDt
+     */
+    @PostMapping(value = "/user/appoint_user")
+    Result appointUser(@RequestBody UserListDto userListDto);
 
     /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
@@ -37,17 +50,80 @@
 
 
     /**
-     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛椤圭洰
+     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛椤圭洰(鏈悓姝is)
      */
     @PostMapping(value = "/user/project/cancel")
     Result cancelUserProject(@RequestBody UserProjectDto userProjectDto);
 
     /**
-     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛浼樻儬鍒�
+     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛浼樻儬鍒�(鏈悓姝is)
      */
     @PostMapping(value = "/user/coupon/cancel")
     Result cancelUserCoupon(@RequestBody UserCouponDto userCouponDto);
 
+    /**
+     * 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 浼氬憳绛夌骇
+     */
+    @PostMapping("/user/sync/update/his/user/level")
+    Result updateMembership(@RequestBody JSONObject jsonObject);
 
+    /**
+     * 鐢ㄦ埛鍗囩骇杩涘害
+     */
+    @PostMapping("user/level/progress")
+    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);
 }
\ No newline at end of file

--
Gitblit v1.8.0