From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 b99219d..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")
@@ -44,4 +52,23 @@
@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