From a7a946b8720345bc25c6626a7e5a2298cc16d67e Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 31 一月 2024 11:34:48 +0800 Subject: [PATCH] Merge branch 'master-fwq优惠券增加平台限制信息' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java index faff2c7..457e1d6 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java @@ -1,7 +1,9 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; -import com.hz.his.dto.coupon.CouponDto; +import com.hz.his.dto.coupon.*; +import com.hz.his.dto.user.coupon.UserCanUseCouponDto; +import com.hz.his.dto.user.coupon.UserCouponDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -25,11 +27,67 @@ Result sendUserCoupon(@RequestBody CouponDto couponDto); /** + * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰 + */ + @PostMapping(value = "/coupon/send/coupon/by/money") + Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto); + + /** * 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒� */ @PostMapping(value = "/coupon/cancel/coupon") Result cancelUserCoupon(@RequestBody CouponDto couponDto); + /** + * 寮�鏀惧钩鍙�-鑾峰彇鑹惧績鑽熶紭鎯犲埜2.0鍒楄〃 + * @param dto + * @return + */ + @PostMapping(value = "/coupon/get/Coupon") + Result getCoupon(@RequestBody CouponDto dto); + /** + * 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛浼樻儬鍒� + */ + @PostMapping(value = "/coupon/invalid/user/coupon") + Result invalidCouponNumber(@RequestBody CouponDto couponDto); + + /** + * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 + */ + @PostMapping(value = "/coupon/check/coupon") + Result checkCoupon(@RequestBody CouponDto couponDto); + + /** + * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢� + */ + @PostMapping(value = "/coupon/check/coupon/to/orderAndPay") + Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto); + + /** + * 寮�鏀惧钩鍙�-璁㈠崟鍙戞斁浼樻儬鍒� + */ + @PostMapping(value = "/coupon/order/send/coupon") + Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto); + + + + /** + * 寮�鏀惧钩鍙�-鏍¢獙浼樻儬鍒告槸鍚﹀瓨鍦� 鍒涘缓鎴栬�呮洿鏂� + */ + @PostMapping(value = "/coupon/check/create") + Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto); + + /** + * 寮�鏀惧钩鍙�- 鏍¢獙浼樻儬鍒稿墿浣欐暟閲� + */ + @PostMapping(value = "/coupon/check/surplus/num") + Result checkCouponSurplusNum(@RequestBody CouponDto couponDto); + + /** + * 寮�鏀惧钩鍙�- 寤舵湡鐢ㄦ埛浼樻儬鍒� + */ + @PostMapping(value = "/user/coupon/delay/coupon") + Result delayUserCoupon(@RequestBody UserDelayCouponDto userDelayCouponDto); } \ No newline at end of file -- Gitblit v1.8.0