From 194fbb628f82b1bbf15a6c649fffcacf922f4391 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 19 十月 2023 18:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 2 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 4d566b6..970d425 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,13 +1,13 @@
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 com.hz.his.vo.order.refund.RefundCancelVo;
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 javax.servlet.http.HttpServletRequest;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -54,6 +54,7 @@
/**
* 寮�鏀惧钩鍙�-寮�鍗�
+ * 瀹炰綋杞寲鐢� CreateOrderReturnDto
*/
@PostMapping(value = "/order/add")
Result orderAdd(@RequestBody OrderPHisDto dto);
@@ -63,4 +64,127 @@
*/
@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);
+
+ /**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鎶樻墸瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit")
+ Result marketingAduit(@RequestBody AduitDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鏀粯瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit/pay")
+ Result marketingAduitPay(@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);
+
+ /**
+ * 閲嶆柊鍒濆鍖栬鍗曢噾棰�
+ * 鏍规嵁鏀粯璁板綍鍘婚噸鏂扮畻鍚勭閲戦
+ */
+ @PostMapping(value = "/order/init/order-money")
+ Result initOrderMoney(@RequestBody OrderInitVo orderInitVo);
+
+ /**
+ * 寮�鏀惧钩鍙�-浣滃簾閫�娆�
+ * data 瀹炰綋杞寲鐢� 鏃�
+ */
+ @PostMapping(value = "/order/refund/cancel")
+ Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);
+
+
+ /**
+ * 璁＄畻璁㈠崟搴斾粯閲戦
+ */
+ @PostMapping(value = "/order/countOrderShouldTotal")
+ Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0