From 9a68e48e77e752ab4dbace7612a95b8d9187dcbc Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 01 九月 2022 16:23:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 430e340..e0e353f 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,11 +1,13 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.card.CardQueryDto;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -17,30 +19,48 @@
* 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
*/
@PostMapping(value = "/newSync/order/add")
- Result createOrder(@RequestParam("params") String params);
+ Result createOrder(@RequestBody OrderCreateDto params);
/**
* 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
*/
@PostMapping(value = "/newSync/order/orderUpdate")
- Result updateOrderStatus(@RequestParam("params") String params);
+ Result updateOrderStatus(@RequestBody OrdersTotalDto params);
/**
* 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
*/
@PostMapping(value = "/newSync/order/pay")
- Result payOrderSuc(@RequestParam("params") String params);
+ Result payOrderSuc(@RequestBody OrderPayDto params);
/**
* 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
*/
@PostMapping(value = "/newSync/order/refund")
- Result refundOrder(@RequestParam("params") String params);
+ Result refundOrder(@RequestBody OrderRefundDto params);
/**
* 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
*/
@PostMapping(value = "/newSync/order/cancel")
- Result cancelOrder(@RequestParam("params") String params);
+ Result cancelOrder(@RequestBody OrderRefundDto params);
+ /**
+ * 寮�鏀惧钩鍙�-鍚屾涓績蹇冭烦閫�娆炬祦绋�
+ */
+ @PostMapping(value = "/refund/syn/refund")
+ Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-寮�鍗�
+ */
+ @PostMapping(value = "/order/add")
+ Result orderAdd(@RequestBody OrderPHisDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-缁撹处
+ */
+ @PostMapping(value = "/order/pay")
+ Result orderPay(@RequestBody PayDto dto);
}
\ No newline at end of file
--
Gitblit v1.8.0