From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index bb49a46..86134c3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -145,5 +145,16 @@
     @PostMapping(value = "/order/refund/nextStep")
     Result nextStep(OrderRefundDto orderRefundDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟閮ㄥ垎閫�娆惧鏍搁�氳繃/鎷掔粷鎺ュ彛
+     */
+    @PostMapping(value = "/audit/order/partRefund")
+    Result partRefundApproval(@RequestBody AduitDto aduitDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鍏ㄩ儴閫�娆�
+     * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+     */
+    @PostMapping(value = "/order/whole/refund")
+    Result wholeRefund(@RequestBody OrderRefundDto orderRefundDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0