From cb7bf61ddec695b25f8fe509815c5e5794180b0f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 17 七月 2024 17:14:53 +0800
Subject: [PATCH] Merge branch 'master-base' into master-fwq-爆款活动2.0

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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..412adb3 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;
@@ -69,4 +69,23 @@
      */
     @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