From 88e548f766229ab4b70fcfdbbb9c515521dc9e08 Mon Sep 17 00:00:00 2001 From: zhouxiang <zhouxiang> Date: 星期三, 31 八月 2022 11:34:25 +0800 Subject: [PATCH] 添加开单并且结账接口 --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 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 c87eb6f..90980cf 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 @@ -3,18 +3,18 @@ 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.UserIdsDto; import com.hz.his.dto.user.UserLevelDto; 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.OrderCanUseCouponDto; -import com.hz.his.dto.user.coupon.UserCanUseCouponDto; -import com.hz.his.dto.user.coupon.UserCouponDto; +import com.hz.his.dto.user.coupon.*; 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.packages.UserPackageDto; +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; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -31,6 +31,12 @@ * */ @PostMapping(value = "/user/list") Result userList(@RequestBody UserDto userDto); + + /** + * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃 + * */ + @PostMapping(value = "/user/list/ids") + Result userIdList(@RequestBody UserDto userDto); /** * 鑾峰彇鍒扮敤鎴疯鎯� @@ -89,10 +95,9 @@ /** * 鑾峰彇鐢ㄦ埛淇冮攢浣跨敤璁板綍 - * @param orderItemNo 瀛愯鍗曞彿 * */ @PostMapping(value = "/user/promotion/used") - Result userPromotionUsed(@RequestParam("orderItemNo") String orderItemNo); + Result userPromotionUsed(@RequestBody UserPromotionUsedDto userPromotionUsedDto); /** @@ -118,7 +123,7 @@ * 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒� * */ @PostMapping(value = "/goods/can/use/coupon") - Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto); + Result goodsCanUseCoupon(@RequestBody GoodsUsedCouponDto goodsUsedCouponDto); /** * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜 @@ -223,9 +228,21 @@ 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); } \ No newline at end of file -- Gitblit v1.8.0