From 873ac5215f8beb51a957a84bceecd7ca8d713db2 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 10 五月 2023 16:42:09 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 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 1407ddc..13b20dc 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
@@ -3,6 +3,7 @@
 import com.hx.resultTool.Result;
 import com.hz.his.dto.aduit.AduitDto;
 import com.hz.his.dto.order.*;
+import com.hz.his.vo.order.refund.RefundCancelVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -150,4 +151,26 @@
      */
     @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);
+
+    /**
+     * 寮�鏀惧钩鍙�-浣滃簾閫�娆�
+     * data 瀹炰綋杞寲鐢� 鏃�
+     */
+    @PostMapping(value = "/order/refund/cancel")
+    Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0