From 32bf00ebc825716caf9424a137df7c5adf7f39ac Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 八月 2022 17:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 5f4993b..813beb3 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
@@ -7,6 +7,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
+import javax.servlet.http.HttpServletRequest;
+
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@@ -49,9 +51,16 @@
@PostMapping(value = "/refund/syn/refund")
Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
/**
- * 寮�鏀惧钩鍙�-寮�鍗曞苟涓旂粨璐︽帴鍙�
+ * 寮�鏀惧钩鍙�-寮�鍗�
*/
- @PostMapping(value = "/create/pay/order")
- Result createPayOrder(@RequestBody OrderPHisDto dto);
+ @PostMapping(value = "/order/add")
+ Result orderAdd(HttpServletRequest request, @RequestBody OrderPHisDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-缁撹处
+ */
+ @PostMapping(value = "/order/pay")
+ Result orderPay(HttpServletRequest request,@RequestBody PayDto dto);
}
\ No newline at end of file
--
Gitblit v1.8.0