From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 bc7cdb3..3cfa716 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,6 +3,7 @@
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;
@@ -105,6 +106,12 @@
Result marketingAduit(@RequestBody AduitDto dto);
/**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鏀粯瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit/pay")
+ Result marketingAduitPay(@RequestBody AduitDto dto);
+
+ /**
* 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
*/
@PostMapping(value = "/audit/order/cancel")
@@ -162,6 +169,24 @@
* 閲嶆柊鍒濆鍖栬鍗曢噾棰�
* 鏍规嵁鏀粯璁板綍鍘婚噸鏂扮畻鍚勭閲戦
*/
- @PostMapping(value = "/order/whole/refund")
+ @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);
+
+ /** 閫�娆惧墠閫昏緫妫�鏌� */
+ @PostMapping(value = "/order/reufnd/afrer/check")
+ Result refundAfterCheck(@RequestBody OrderRefundDto dto);
}
\ No newline at end of file
--
Gitblit v1.8.0