From e8bba077c22ca0507b21d463dc9ec2ac922835de Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 22 十一月 2023 17:22:00 +0800
Subject: [PATCH] Merge branch 'rx-1116-营销生日券' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index bdbba21..1383bdd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -1,14 +1,15 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
-import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
-import com.hz.his.dto.user.coupon.*;
-import com.hz.his.dto.user.money.*;
+import com.hz.his.dto.user.coupon.GoodsUsedCouponDto;
+import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.label.UserLabelDto;
-import com.hz.his.dto.user.packages.UserPackageDto;
+import com.hz.his.dto.user.money.*;
import com.hz.his.dto.user.packages.UserPhisPackageDto;
import com.hz.his.dto.user.project.UserProjectDto;
import com.hz.his.dto.user.project.UserProjectUsedDto;
@@ -17,6 +18,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -170,7 +173,7 @@
/**
* 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
- * 杩斿洖浣跨敤Dt
+ * 杩斿洖浣跨敤UserHaveDt
* */
@PostMapping(value = "/user/have/count")
Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
@@ -254,4 +257,105 @@
@PostMapping(value = "/user/crowd/import")
Result userCrowdImport(@RequestBody UserDto userDto);
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ */
+ @PostMapping(value = "/user/crowd/import/new")
+ Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
+ */
+ @PostMapping(value = "/user/project/items")
+ Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);
+
+ /**
+ * 鑾峰彇鍒扮敤鎴疯鎯�(鍚屾浣跨敤)
+ * @param userId 鐢ㄦ埛鏍囪瘑
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/info/baseInfo")
+ Result userInfoBaseInfo(@RequestParam("userId") String userId);
+
+ /**
+ * 鑾峰彇鍒扮敤鎴�
+ */
+ @PostMapping(value = "/user/sync/by/idList")
+ Result userSyncList(@RequestBody List<String> hisIdList);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
+ * @param userDto userId
+ * @return
+ */
+ @PostMapping(value = "/user/check/member")
+ Result checkMember(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浼氬憳绛夌骇涓嬩竴绾�
+ * */
+ @PostMapping(value = "/user/next/level")
+ Result nextLevel(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ绱杩斾剑
+ * */
+ @PostMapping(value = "/user/query/rebate")
+ Result queryRebate(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/first/day/consumption")
+ Result firstDayConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/accumulat/consumption")
+ Result accumulateConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/upgraded/aesthetics")
+ Result checkUpgradedAesthetics(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/consumption")
+ Result checkConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @PostMapping(value = "/user/rebate/userId")
+ Result queryRebateByUserId(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @PostMapping(value = "/user/query/oldNewPerformance")
+ Result queryOldNewPerformance(@RequestBody UserDto userDto);
+
+
+ @PostMapping(value = "/user/draw/list")
+ Result drawGetUserDt(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绉戝鍏崇郴
+ * */
+ @PostMapping(value = "/user/room/list")
+ Result userRoomList(@RequestBody UserDto userDto);
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 宸茬粡杩囨湡鍜屾湭杩囨湡鐨勪笖杩囨护鐢熸棩鍒�
+ * */
+ @PostMapping(value = "/user/coupon/by/valid/state")
+ Result userCouponByValidState(@RequestBody UserCouponDto userCouponDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0