From eab899c4fe225961e5ccf43ea8db67af4efb4284 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 24 十月 2023 19:10:15 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 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 c8e699a..41d1a12 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,10 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.coupon.CouponAddDto;
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;
@@ -23,6 +26,12 @@
*/
@PostMapping(value = "/coupon/send/coupon")
Result sendUserCoupon(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰
+ */
+ @PostMapping(value = "/coupon/send/coupon/by/money")
+ Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);
/**
* 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
@@ -55,4 +64,31 @@
*/
@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/use/quato/info/by/total")
+ Result couponUseQuotaInfoByTotal(@RequestBody CouponAddDto couponAddDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇浼樻儬鍒搁檺棰濋厤缃� 褰撳墠鏈�
+ */
+ @PostMapping(value = "/coupon/use/quato/info/by/month")
+ Result couponUseQuotaInfoByMonth(@RequestBody CouponAddDto couponAddDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0