From ce0dc32dcecbe1cf19d63c7bed1a87a90191f2ed Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 26 八月 2024 14:47:31 +0800
Subject: [PATCH] Merge branch 'fhx-base-治疗单改版0729' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 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 a638ca7..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,7 +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.*;
+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;
@@ -25,6 +27,12 @@
     Result sendUserCoupon(@RequestBody CouponDto couponDto);
 
     /**
+     * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰
+     */
+    @PostMapping(value = "/coupon/send/coupon/by/money")
+    Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);
+
+    /**
      * 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
      */
     @PostMapping(value = "/coupon/cancel/coupon")
@@ -38,4 +46,46 @@
     @PostMapping(value = "/coupon/get/Coupon")
     Result getCoupon(@RequestBody CouponDto dto);
 
+    /**
+     * 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛浼樻儬鍒�
+     */
+    @PostMapping(value = "/coupon/invalid/user/coupon")
+    Result invalidCouponNumber(@RequestBody CouponDto couponDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤
+     */
+    @PostMapping(value = "/coupon/check/coupon")
+    Result checkCoupon(@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