From 88266975b971203030b35aee074dc89d4ce9dafe Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期五, 21 四月 2023 10:49:09 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 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 47f9267..3ea198b 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,13 @@
 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.UserInviteeInfoDto;
+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.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;
@@ -13,8 +15,22 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platfrom-service",path = "/phip",contextId = "phip-user")
+@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 +53,32 @@
 
 
     /**
-     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛椤圭洰
+     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛椤圭洰(鏈悓姝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);
 }
\ No newline at end of file

--
Gitblit v1.8.0