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 | 71 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 12 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 a7bc22f..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
@@ -1,14 +1,11 @@
package com.hz.his.feign.service.platform;
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 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.RequestHeader;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -17,31 +14,31 @@
public interface SPhipOrderService {
/**
- * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
+ * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his (搴熷純)
*/
@PostMapping(value = "/newSync/order/add")
Result createOrder(@RequestBody OrderCreateDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis (搴熷純)
*/
@PostMapping(value = "/newSync/order/orderUpdate")
Result updateOrderStatus(@RequestBody OrdersTotalDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his (搴熷純)
*/
@PostMapping(value = "/newSync/order/pay")
Result payOrderSuc(@RequestBody OrderPayDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis (搴熷純)
*/
@PostMapping(value = "/newSync/order/refund")
Result refundOrder(@RequestBody OrderRefundDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
+ * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his (搴熷純)
*/
@PostMapping(value = "/newSync/order/cancel")
Result cancelOrder(@RequestBody OrderRefundDto params);
@@ -51,4 +48,54 @@
*/
@PostMapping(value = "/refund/syn/refund")
Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-寮�鍗�
+ * 瀹炰綋杞寲鐢� CreateOrderReturnDto
+ */
+ @PostMapping(value = "/order/add")
+ Result orderAdd(@RequestBody OrderPHisDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-缁撹处
+ */
+ @PostMapping(value = "/order/pay")
+ Result orderPay(@RequestBody PayDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛纭璁㈠崟
+ */
+ @PostMapping(value = "/order/customer/confirm")
+ Result customerConfirm(@RequestBody OrderInfoDto orderInfoDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟
+ */
+ @PostMapping(value = "/order/cancel/verification")
+ Result cancelVerification(@RequestBody CancelOrderDto cancelOrderDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍙栨秷璁㈠崟锛堟柊锛�
+ * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+ */
+ @PostMapping(value = "/order/cancel/v3")
+ Result cancel(@RequestBody CancelOrderDto cancelOrderDto);
+ /**
+ * 寮�鏀惧钩鍙�-鏍规嵁璁㈠崟id鑾峰彇閫�娆惧崟淇℃伅
+ */
+ @PostMapping(value = "/order/refundNote/list")
+ Result noteList(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
+ /**
+ * 寮�鏀惧钩鍙�-纭閫�娆惧崟
+ */
+ @PostMapping(value = "/order/refundNote/confirm")
+ 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