From 07612f2a98dcd9c5c54d2b053987690fec010faa Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 11 十月 2022 14:48:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 0bc3a1e..6f12054 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
@@ -73,23 +73,29 @@
* 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟
*/
@PostMapping(value = "/order/cancel/verification")
- Result cancelVerification(@RequestBody OrderRefundDto orderRefundDto);
+ Result cancelVerification(@RequestBody CancelOrderDto cancelOrderDto);
/**
* 寮�鏀惧钩鍙�-鍙栨秷璁㈠崟锛堟柊锛�
* data 瀹炰綋杞寲鐢� CancelOrderReturnDto
*/
- @PostMapping(value = "/order/cancel/list")
- Result cancel(@RequestBody OrderRefundDto orderRefundDto);
+ @PostMapping(value = "/order/cancel/v3")
+ Result cancel(@RequestBody CancelOrderDto cancelOrderDto);
/**
* 寮�鏀惧钩鍙�-鏍规嵁璁㈠崟id鑾峰彇閫�娆惧崟淇℃伅
*/
@PostMapping(value = "/order/refundNote/list")
- Result noteList(@RequestBody OrderRefundDto orderRefundDto);
+ Result noteList(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
/**
* 寮�鏀惧钩鍙�-纭閫�娆惧崟
*/
@PostMapping(value = "/order/refundNote/confirm")
- Result noteConfirm(@RequestBody OrderRefundDto orderRefundDto);
+ Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏌ヨ璁㈠崟鏀粯闆嗗悎
+ */
+ @PostMapping(value = "/order/get/ConsumePay")
+ Result getConsumePay(@RequestBody PayDto dto);
}
\ No newline at end of file
--
Gitblit v1.8.0