From 3ea49203f323e2fe2471488425bab1884d680c21 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 24 二月 2023 11:18:59 +0800
Subject: [PATCH] 创建订单-促销金额计算优化-折扣问题
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 82 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 8 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 d91cb69..86134c3 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,12 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.aduit.AduitDto;
import com.hz.his.dto.order.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -73,22 +74,87 @@
* 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟
*/
@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);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏌ヨ璁㈠崟鏀粯闆嗗悎
+ */
+ @PostMapping(value = "/order/get/ConsumePay")
+ Result getConsumePay(@RequestBody PayDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鎶樻墸瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit")
+ Result marketingAduit(@RequestBody AduitDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/order/cancel")
+ Result cancelApproval(@RequestBody AduitDto aduitDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-寮�鍗�
+ * 瀹炰綋杞寲鐢� CreateOrderReturnDto
+ */
+ @PostMapping(value = "/order/create")
+ Result orderCreate(@RequestBody OrderPHisDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-缁撹处
+ */
+ @PostMapping(value = "/order/payMoney")
+ Result orderPayMoney(@RequestBody PayDto dto);
+ /**
+ * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆�
+ * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+ */
+ @PostMapping(value = "/order/partial/refund")
+ Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);
+
+ /**
+ * 閮ㄥ垎閫�娆炬樉绀烘暟鎹帴鍙�
+ * data 瀹炰綋杞寲鐢� OrderDto
+ */
+ @PostMapping(value = "/order/refund/details")
+ Result refundDetails(OrderRefundDto orderRefundDto);
+
+ /**
+ * 閫夊畬鏁伴噺鐐瑰嚮涓嬩竴姝ユ樉绀烘暟鎹帴鍙�
+ * data 瀹炰綋杞寲鐢� OrderOrderRefundDtoDto
+ */
+ @PostMapping(value = "/order/refund/nextStep")
+ Result nextStep(OrderRefundDto orderRefundDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟閮ㄥ垎閫�娆惧鏍搁�氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/order/partRefund")
+ Result partRefundApproval(@RequestBody AduitDto aduitDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍏ㄩ儴閫�娆�
+ * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+ */
+ @PostMapping(value = "/order/whole/refund")
+ Result wholeRefund(@RequestBody OrderRefundDto orderRefundDto);
}
\ No newline at end of file
--
Gitblit v1.8.0