From 74527e7ce6ab1a5e09d3d4936e5157188e983e49 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 二月 2024 16:12:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 41d1a12..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;
@@ -80,15 +79,15 @@
Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto);
/**
- * 寮�鏀惧钩鍙�-鑾峰彇浼樻儬鍒搁檺棰濋厤缃� 鎬荤殑
+ * 寮�鏀惧钩鍙�- 鏍￠獙浼樻儬鍒稿墿浣欐暟閲�
*/
- @PostMapping(value = "/coupon/use/quato/info/by/total")
- Result couponUseQuotaInfoByTotal(@RequestBody CouponAddDto couponAddDto);
+ @PostMapping(value = "/coupon/check/surplus/num")
+ Result checkCouponSurplusNum(@RequestBody CouponDto couponDto);
/**
- * 寮�鏀惧钩鍙�-鑾峰彇浼樻儬鍒搁檺棰濋厤缃� 褰撳墠鏈�
+ * 寮�鏀惧钩鍙�- 寤舵湡鐢ㄦ埛浼樻儬鍒�
*/
- @PostMapping(value = "/coupon/use/quato/info/by/month")
- Result couponUseQuotaInfoByMonth(@RequestBody CouponAddDto couponAddDto);
+ @PostMapping(value = "/user/coupon/delay/coupon")
+ Result delayUserCoupon(@RequestBody UserDelayCouponDto userDelayCouponDto);
}
\ No newline at end of file
--
Gitblit v1.8.0