From 02e460a52667915cda6c4ebb58488646795c37ec Mon Sep 17 00:00:00 2001
From: 童刚 <pBP8jclM@8yTJ@4h>
Date: 星期三, 03 八月 2022 18:59:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 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 014cd48..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;
@@ -14,34 +15,34 @@
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-order")
public interface SPhipOrderService {
-// /**
-// * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
-// */
-// @PostMapping(value = "/newSync/order/add")
-// Result createOrder(@RequestBody OrderCreateDto params);
-//
-// /**
-// * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
-// */
-// @PostMapping(value = "/newSync/order/orderUpdate")
-// Result updateOrderStatus(@RequestBody OrdersTotal params);
-//
-// /**
-// * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
-// */
-// @PostMapping(value = "/newSync/order/pay")
-// Result payOrderSuc(@RequestBody OrderPayDto params);
-//
-// /**
-// * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
-// */
-// @PostMapping(value = "/newSync/order/refund")
-// Result refundOrder(String params);
-//
-// /**
-// * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
-// */
-// @PostMapping(value = "/newSync/order/cancel")
-// Result cancelOrder(String params);
+ /**
+ * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
+ */
+ @PostMapping(value = "/newSync/order/add")
+ Result createOrder(@RequestBody OrderCreateDto params);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
+ */
+ @PostMapping(value = "/newSync/order/orderUpdate")
+ Result updateOrderStatus(@RequestBody OrdersTotalDto params);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
+ */
+ @PostMapping(value = "/newSync/order/pay")
+ Result payOrderSuc(@RequestBody OrderPayDto params);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
+ */
+ @PostMapping(value = "/newSync/order/refund")
+ Result refundOrder(@RequestBody OrderRefundDto params);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
+ */
+ @PostMapping(value = "/newSync/order/cancel")
+ Result cancelOrder(@RequestBody OrderRefundDto params);
}
\ No newline at end of file
--
Gitblit v1.8.0