From 24a92d0c1fd0a96ccdb1fc5b43aafe7ddd68fa93 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 14 十一月 2023 19:09:42 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 90 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 3 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..837a5dd 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.user.UserListDto;
-import com.hz.his.dto.user.UserParamDto;
-import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
+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,81 @@
@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);
+
+ /**
+ * 鐢ㄦ埛鍏虫敞浜у搧璁板綍
+ */
+ @PostMapping("/attention/product/record/edit")
+ Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info")
+ Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-淇敼鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info/update")
+ Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
+ */
+ @PostMapping(value = "/user/level/calc")
+ Result userLevelCalc(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鐨勫叕浼楀彿淇℃伅
+ */
+ @PostMapping(value = "/user/gzh/info")
+ Result userGZHInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇crm灏忕▼搴忚烦杞摼鎺�
+ */
+ @PostMapping(value = "/user/crm/url/link")
+ Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍙戦�佽幏瀹㈡秷鎭坊鍔犲鎴�
+ */
+ @PostMapping(value = "/user/acquisition/sent")
+ Result sentUserAcquisitionSMS(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鑾峰鏁版嵁璁板綍
+ */
+ @PostMapping(value = "/user/acquisition/list")
+ Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖鏂板
+ */
+ @PostMapping(value = "/user/room/doctor/diagnosis/create")
+ Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
+ */
+ @PostMapping(value = "/user/common/approve/create")
+ Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
}
\ No newline at end of file
--
Gitblit v1.8.0