From 4791362c19d2d27a51593d625abb24173d1c63f2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 06 九月 2022 19:23:52 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index ac8ba31..bf1a920 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -45,14 +45,12 @@
*
* @return
*/
- @PostMapping("/refond")
- public ResponseVO<Object> refond(@RequestBody PayParam params) {
+ @PostMapping("/refund")
+ public ResponseVO<Object> refund(@RequestBody PayParam params) {
if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) {
throw new BusinessException("閫�娆惧弬鏁颁笉鑳戒负绌�");
}
- // 0.00 鐢ㄤ簬鍗犱綅 娌℃湁瀹為檯鐢ㄥ 閫�娆炬帴鍙ｅソ鍑犱釜鍦版柟璋冪敤 涓嶅お濂芥敼
- return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo(),
- 0.00));
+ return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo()));
}
/**
@@ -62,7 +60,7 @@
*/
@AnonymousAccess
@PostMapping("/advancePay")
- public ResponseVO<Object> advancePayOrder(HttpServletRequest request, @RequestBody PayParam param) throws WxErrorException {
+ public ResponseVO<Object> advancePayOrder(HttpServletRequest request, @RequestBody PayParam param) throws WxErrorException, InterruptedException {
if (param.getOpenId().isEmpty()) {
throw new BusinessException("寰俊code涓嶈兘涓虹┖");
}
@@ -92,30 +90,6 @@
}
- /**
- * 璁㈠崟鐘舵�佹煡璇� 寰俊鏀粯
- *
- * @param param
- * @return
- */
- @RequestMapping("/queryOrder")
- public ResponseVO<Object> queryOrder(@RequestBody PayParam param) {
- if (param.getOrderId() == null) {
- throw new BusinessException("璇疯緭鍏ユ纭殑璁㈠崟id");
- }
- C3mOrder order = c3mOrderService.getById(param.getOrderId());
- if (order == null) {
- throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
- }
- if ((OrderType.ALIPAY.getCode()).equals(order.getOrderType())) {
- return ResponseUtil.success(AliPayUtils.alipayQuery(order.getOutTradeNo(), param.getPoleId()));
- } else if ((OrderType.WXPAY.getCode()).equals(order.getOrderType())) {
- return ResponseUtil.success(wxPayService.WxOrderQuery(param.getPoleId(), order.getOutTradeNo()));
- } else {
- return ResponseUtil.success("鏀粯鏂瑰紡寮傚父");
- }
-
- }
/**
* 璁㈠崟鍒楄〃
--
Gitblit v1.9.3