From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +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 | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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..2336000 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,15 @@
@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 parmData);
}
\ No newline at end of file
--
Gitblit v1.8.0