From 1918bee03c0924732c60c8db14a37a70cf2e0acc Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 27 四月 2023 10:28:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   18 ++++++++++++++++++
 1 files changed, 18 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..77490ef 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,23 @@
     @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);
+
+    /**
+     * 閲嶆柊鍒濆鍖栬鍗曢噾棰�
+     * 鏍规嵁鏀粯璁板綍鍘婚噸鏂扮畻鍚勭閲戦
+     */
+    @PostMapping(value = "/order/init/order-money")
+    Result initOrderMoney(@RequestBody OrderInitVo orderInitVo);
 }
\ No newline at end of file

--
Gitblit v1.8.0