From d8afbdc39cd6e7739054fc1cc21898e0b81216d0 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 21 八月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 13 +++++++++++++
1 files changed, 13 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 2c16814..d9da89b 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,7 @@
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;
@@ -24,6 +25,12 @@
*/
@PostMapping(value = "/coupon/send/coupon")
Result sendUserCoupon(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰
+ */
+ @PostMapping(value = "/coupon/send/coupon/by/money")
+ Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);
/**
* 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
@@ -56,4 +63,10 @@
*/
@PostMapping(value = "/coupon/order/send/coupon")
Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢�
+ */
+ @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
+ Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
--
Gitblit v1.8.0