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 |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 412adb3..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
@@ -59,16 +59,18 @@
     Result checkCoupon(@RequestBody CouponDto couponDto);
 
     /**
+     * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢�
+     */
+    @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
+    Result checkCouponToOrderAndPay(@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);
+
 
     /**
      * 寮�鏀惧钩鍙�-鏍¢獙浼樻儬鍒告槸鍚﹀瓨鍦� 鍒涘缓鎴栬�呮洿鏂�

--
Gitblit v1.8.0