From 6af64892d593303fed386e468347c2ff41ab99b6 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 12 八月 2022 19:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 15c0ae2..5827a98 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
@@ -1,9 +1,10 @@
package com.hz.his.feign.service.platform;
-import com.hx.phiappt.model.order.OrdersTotal;
-import com.hx.phip.dto.order.OrderCreateDto;
-import com.hx.phip.dto.order.OrderPayDto;
import com.hx.resultTool.Result;
+import com.hz.his.dto.order.OrderCreateDto;
+import com.hz.his.dto.order.OrderPayDto;
+import com.hz.his.dto.order.OrderRefundDto;
+import com.hz.his.dto.order.OrdersTotalDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +25,7 @@
* 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
*/
@PostMapping(value = "/newSync/order/orderUpdate")
- Result updateOrderStatus(@RequestBody OrdersTotal params);
+ Result updateOrderStatus(@RequestBody OrdersTotalDto params);
/**
* 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
@@ -36,12 +37,12 @@
* 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
*/
@PostMapping(value = "/newSync/order/refund")
- Result refundOrder(String params);
+ Result refundOrder(@RequestBody OrderRefundDto params);
/**
* 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
*/
@PostMapping(value = "/newSync/order/cancel")
- Result cancelOrder(String params);
+ Result cancelOrder(@RequestBody OrderRefundDto params);
}
\ No newline at end of file
--
Gitblit v1.8.0