From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 d9da89b..457e1d6 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,9 +1,9 @@
package com.hz.his.feign.service.platform;
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 com.hz.his.dto.coupon.*;
+import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -59,14 +59,35 @@
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);
+ @PostMapping(value = "/coupon/check/create")
+ Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto);
+
+ /**
+ * 寮�鏀惧钩鍙�- 鏍￠獙浼樻儬鍒稿墿浣欐暟閲�
+ */
+ @PostMapping(value = "/coupon/check/surplus/num")
+ Result checkCouponSurplusNum(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�- 寤舵湡鐢ㄦ埛浼樻儬鍒�
+ */
+ @PostMapping(value = "/user/coupon/delay/coupon")
+ Result delayUserCoupon(@RequestBody UserDelayCouponDto userDelayCouponDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0