From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 10:46:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 c8e699a..d9da89b 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
@@ -2,6 +2,8 @@
 
 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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,12 @@
      */
     @PostMapping(value = "/coupon/send/coupon")
     Result sendUserCoupon(@RequestBody CouponDto couponDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰
+     */
+    @PostMapping(value = "/coupon/send/coupon/by/money")
+    Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);
 
     /**
      * 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
@@ -51,6 +59,12 @@
     Result checkCoupon(@RequestBody CouponDto couponDto);
 
     /**
+     * 寮�鏀惧钩鍙�-璁㈠崟鍙戞斁浼樻儬鍒�
+     */
+    @PostMapping(value = "/coupon/order/send/coupon")
+    Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
+
+    /**
      * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢�
      */
     @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")

--
Gitblit v1.8.0