From 0a950f6746ac38fcd6813ed7076047e0f27531eb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 23 九月 2022 10:37:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 27 ++++++++++++++++++++++++---
phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderReturnDto.java | 15 +++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderReturnDto.java
new file mode 100644
index 0000000..c3f7bae
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderReturnDto.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * @Author 鍙栨秷璁㈠崟杩斿洖data閲岄潰鐨勬暟鎹�
+ */
+@Data
+public class CancelOrderReturnDto {
+
+ /**閫�娆捐褰昳d*/
+ private String refundRecordId;
+ /**閫�娆捐褰昪ode*/
+ private String refundRecordCode;
+}
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 bc60000..0bc3a1e 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
@@ -3,9 +3,7 @@
import com.hx.resultTool.Result;
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;
@@ -71,4 +69,27 @@
@PostMapping(value = "/order/customer/confirm")
Result customerConfirm(@RequestBody OrderInfoDto orderInfoDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟
+ */
+ @PostMapping(value = "/order/cancel/verification")
+ Result cancelVerification(@RequestBody OrderRefundDto orderRefundDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍙栨秷璁㈠崟锛堟柊锛�
+ * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+ */
+ @PostMapping(value = "/order/cancel/list")
+ Result cancel(@RequestBody OrderRefundDto orderRefundDto);
+ /**
+ * 寮�鏀惧钩鍙�-鏍规嵁璁㈠崟id鑾峰彇閫�娆惧崟淇℃伅
+ */
+ @PostMapping(value = "/order/refundNote/list")
+ Result noteList(@RequestBody OrderRefundDto orderRefundDto);
+ /**
+ * 寮�鏀惧钩鍙�-纭閫�娆惧崟
+ */
+ @PostMapping(value = "/order/refundNote/confirm")
+ Result noteConfirm(@RequestBody OrderRefundDto orderRefundDto);
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0