From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 ca0241f..86134c3 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.*;
-
-import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -136,7 +136,7 @@
* data 瀹炰綋杞寲鐢� OrderDto
*/
@PostMapping(value = "/order/refund/details")
- Result refundDetails(OrderDto orderDto);
+ Result refundDetails(OrderRefundDto orderRefundDto);
/**
* 閫夊畬鏁伴噺鐐瑰嚮涓嬩竴姝ユ樉绀烘暟鎹帴鍙�
@@ -145,5 +145,16 @@
@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);
}
\ No newline at end of file
--
Gitblit v1.8.0