From 499737916d0cb59092c04d6523d4607ff0a5556a Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 13 十一月 2023 16:39:54 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 7e8b001..9e05588 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
@@ -60,16 +60,18 @@
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/coupon/to/orderAndPay")
- Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
+
/**
* 寮�鏀惧钩鍙�-鏍￠獙浼樻儬鍒告槸鍚﹀瓨鍦� 鍒涘缓鎴栬�呮洿鏂�
@@ -78,15 +80,9 @@
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);
+ @PostMapping(value = "/coupon/check/surplus/num")
+ Result checkCouponSurplusNum(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
--
Gitblit v1.8.0