From c8364d4a88edc727252b4087979713bf282e1dcf Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期日, 08 十月 2023 11:07:23 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 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 a638ca7..53effb1 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 @@ -2,6 +2,8 @@ import com.hx.resultTool.Result; import com.hz.his.dto.coupon.CouponDto; +import com.hz.his.dto.coupon.CouponSendDto; +import com.hz.his.dto.coupon.OrderSendCouponDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -25,6 +27,12 @@ Result sendUserCoupon(@RequestBody CouponDto couponDto); /** + * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰 + */ + @PostMapping(value = "/coupon/send/coupon/by/money") + Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto); + + /** * 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒� */ @PostMapping(value = "/coupon/cancel/coupon") @@ -38,4 +46,29 @@ @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); + + } \ No newline at end of file -- Gitblit v1.8.0