From adfe35e0fd08f5ec8e93fcaa9171c8d0719c0065 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 28 二月 2023 18:02:54 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 79a648a..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
@@ -1,11 +1,12 @@
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.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;
@@ -15,6 +16,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);
/**
* 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
@@ -48,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