From be8f87087cd6ab5b80e363805f2f582acfbed7b0 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 09 三月 2023 17:44:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 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 072d795..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
@@ -124,4 +124,44 @@
     Result orderPayMoney(@RequestBody PayDto dto);
 
 
+    /**
+     * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆�
+     * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+     */
+    @PostMapping(value = "/order/partial/refund")
+    Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);
+
+    /**
+     * 閮ㄥ垎閫�娆炬樉绀烘暟鎹帴鍙�
+     * data 瀹炰綋杞寲鐢� OrderDto
+     */
+    @PostMapping(value = "/order/refund/details")
+    Result refundDetails(OrderRefundDto orderRefundDto);
+
+    /**
+     * 閫夊畬鏁伴噺鐐瑰嚮涓嬩竴姝ユ樉绀烘暟鎹帴鍙�
+     * data 瀹炰綋杞寲鐢� OrderOrderRefundDtoDto
+     */
+    @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