From 7b4da138fec5a10f36a4e8294e4d66a7631ab32b Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 17 二月 2023 15:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 12 ++++++++++++
1 files changed, 12 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..a1657e4 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
@@ -6,6 +6,7 @@
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 +19,17 @@
/**
* 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍒楄〃
+ * 杩斿洖瀹炰綋鐢║serPhipDt
*/
@PostMapping(value = "/user/list")
Result userList(@RequestBody UserListDto userListDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-绮剧‘鑾峰彇鐢ㄦ埛鍒楄〃
+ * 杩斿洖瀹炰綋鐢║serPhipDt
+ */
+ @PostMapping(value = "/user/appoint_user")
+ Result appointUser(@RequestBody UserListDto userListDto);
/**
* 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
@@ -54,6 +63,9 @@
@PostMapping(value = "/user/coupon/cancel")
Result cancelUserCoupon(@RequestBody UserCouponDto userCouponDto);
+ /** 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 浼氬憳绛夌骇*/
+ @PostMapping("/user/sync/update/his/user/level")
+ Result updateMembership(@RequestBody JSONObject jsonObject);
}
\ No newline at end of file
--
Gitblit v1.8.0