From b3e46dc66eccee594814a3a71845483c6de570ca Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 05 七月 2023 10:08:23 +0800 Subject: [PATCH] Merge branch 'fwq-通用审核接口' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 101 insertions(+), 10 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 e3f5d45..ab4bd11 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,18 +1,16 @@ package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; -import com.hz.his.dto.user.UserAppointmentDto; -import com.hz.his.dto.user.UserDto; -import com.hz.his.dto.user.UserLevelDto; +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.GoodsCanUseCouponDto; +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.money.*; import com.hz.his.dto.user.label.UserLabelDto; -import com.hz.his.dto.user.project.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; import com.hz.his.dto.user.promotion.UserPromotionUsedDto; @@ -32,6 +30,12 @@ * */ @PostMapping(value = "/user/list") Result userList(@RequestBody UserDto userDto); + + /** + * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃 + * */ + @PostMapping(value = "/user/list/ids") + Result userIdList(@RequestBody UserDto userDto); /** * 鑾峰彇鍒扮敤鎴疯鎯� @@ -118,10 +122,11 @@ * 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒� * */ @PostMapping(value = "/goods/can/use/coupon") - Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto); + Result goodsCanUseCoupon(@RequestBody GoodsUsedCouponDto goodsUsedCouponDto); /** * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜 + * 杞寲浣跨敤 CouponNumberDto */ @PostMapping(value = "/order/can/use/coupon") Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto); @@ -166,9 +171,10 @@ /** * 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻 + * 杩斿洖浣跨敤UserHaveDt * */ @PostMapping(value = "/user/have/count") - Result userHaveCount(@RequestParam("userId") String userId); + Result userHaveCount(@RequestBody UserHaveDto userHaveDto); /** @@ -223,9 +229,94 @@ Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId); /** - * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,鎷ユ湁鐨勬爣绛�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�) + * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�) * */ @PostMapping(value = "/user/package/list") - Result userPackageList(@RequestBody UserPackageDto userPackageDto); + Result userPackageList(@RequestBody UserPhisPackageDto userPhisPackageDto); + /**鏍规嵁鏍囪瘑闆嗗悎绛涢�夌敤鎴�*/ + @PostMapping(value = "/user/idList/list") + Result userIdSelectList(@RequestBody UserIdsDto userIdsDto); + + /**鑾峰彇鐢ㄦ埛淇℃伅锛岀煭淇℃ā鏉夸笓鐢� + * 鑾峰彇鏍规嵁id鎴栬�匔IQ鎴栬�卙isId鏌ユ壘鐢ㄦ埛 + * @param userDto 鍙娇鐢╥d鍜孋IQ + * @return 杞寲浣跨敤UserDt + */ + @PostMapping(value = "/user/sms-find") + Result userSms(@RequestBody UserDto userDto); + + /** + * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤 + * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛 + * @param userDto 鍙娇鐢╪ame鍜孋IQ + * @return 杞寲浣跨敤UserDt + */ + @PostMapping(value = "/user/crowd/import") + Result userCrowdImport(@RequestBody UserDto userDto); + + + /** + * 鑾峰彇鐢ㄦ埛瀛愰」鐩� + */ + @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); + + /** + * 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛� + * @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); } \ No newline at end of file -- Gitblit v1.8.0