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 |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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..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
@@ -4,9 +4,9 @@
 import com.hz.his.dto.aduit.AduitDto;
 import com.hz.his.dto.order.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
@@ -124,4 +124,11 @@
     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