From c38f1ddb5247e24f3ea19c7b6890f80068ffe28f Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 27 四月 2023 14:49:33 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 551fae5..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.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;
@@ -18,9 +20,17 @@
 
     /**
      * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍒楄〃
+     * 杩斿洖瀹炰綋鐢║serPhipDt
      */
     @PostMapping(value = "/user/list")
     Result userList(@RequestBody UserListDto userListDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-绮剧‘鑾峰彇鐢ㄦ埛鍒楄〃
+     * 杩斿洖瀹炰綋鐢║serPhipDt
+     */
+    @PostMapping(value = "/user/appoint_user")
+    Result appointUser(@RequestBody UserListDto userListDto);
 
     /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
@@ -54,6 +64,21 @@
     @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