From 51c0f20cc487d127821063d33e643103e14677f5 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 15:11:41 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 9e05588..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,10 +1,9 @@
 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 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;
@@ -85,4 +84,10 @@
     @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