From a8d7e220e8e190dcd3c0ff8a26587820730b41fb Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 07 十二月 2022 16:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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 2cc0092..8428468 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
@@ -104,5 +104,31 @@
     @PostMapping(value = "/audit/marketing/aduit")
     Result marketingAduit(@RequestBody AduitDto dto);
 
+    /**
+     * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+     */
+    @PostMapping(value = "/audit/order/cancel")
+    Result cancelApproval(@RequestBody AduitDto aduitDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-寮�鍗�
+     * 瀹炰綋杞寲鐢� CreateOrderReturnDto
+     */
+    @PostMapping(value = "/order/create")
+    Result orderCreate(@RequestBody OrderPHisDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-缁撹处
+     */
+    @PostMapping(value = "/order/payMoney")
+    Result orderPayMoney(@RequestBody PayDto dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆�
+     * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+     */
+    @PostMapping(value = "/order/partial/refund")
+    Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0