From 3a0ab7a6363ba31b876e95b93e052e9a7db6db66 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期五, 23 九月 2022 11:59:41 +0800
Subject: [PATCH] 取消订单实体生成

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java         |    2 +-
 phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java                 |   16 ++++++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |   10 +++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
new file mode 100644
index 0000000..5aaec20
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * @Author  寮�鏀惧钩鍙板彇娑堣鍗曞叆鍙�
+ */
+@Data
+public class CancelOrderDto {
+
+    /** 璁㈠崟id */
+    private String orderId;
+
+    /** 鎿嶄綔浜篿d */
+    private String operatorId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
index 13a7daf..7b81ec6 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 /**
- * @Author
+ * @Author  閫�娆惧崟鎵╁睍鍏ュ弬
  */
 @Data
 public class OrderRefundNoteListDto {
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 0bc3a1e..41f25e0 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
@@ -73,23 +73,23 @@
      * 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟
      */
     @PostMapping(value = "/order/cancel/verification")
-    Result cancelVerification(@RequestBody OrderRefundDto orderRefundDto);
+    Result cancelVerification(@RequestBody CancelOrderDto CancelOrderDto);
     /**
      * 寮�鏀惧钩鍙�-鍙栨秷璁㈠崟锛堟柊锛�
      * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
      */
-    @PostMapping(value = "/order/cancel/list")
-    Result cancel(@RequestBody OrderRefundDto orderRefundDto);
+    @PostMapping(value = "/order/cancel/v3")
+    Result cancel(@RequestBody CancelOrderDto CancelOrderDto);
      /**
      * 寮�鏀惧钩鍙�-鏍规嵁璁㈠崟id鑾峰彇閫�娆惧崟淇℃伅
      */
     @PostMapping(value = "/order/refundNote/list")
-    Result noteList(@RequestBody OrderRefundDto orderRefundDto);
+    Result noteList(@RequestBody OrderRefundNoteListDto OrderRefundNoteListDto);
     /**
      * 寮�鏀惧钩鍙�-纭閫�娆惧崟
      */
     @PostMapping(value = "/order/refundNote/confirm")
-    Result noteConfirm(@RequestBody OrderRefundDto orderRefundDto);
+    Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
 
 
 }
\ No newline at end of file

--
Gitblit v1.8.0