From e947320e6604a12f5fd6e323b0a885b9a77c1e95 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 29 八月 2022 18:09:24 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 28da159..e61da57 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
@@ -20,6 +20,7 @@
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.SortedMap;
@@ -49,9 +50,7 @@
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()));
}
/**
@@ -61,7 +60,7 @@
*/
@AnonymousAccess
@PostMapping("/advancePay")
- public ResponseVO<Object> advancePayOrder(@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涓嶈兘涓虹┖");
}
@@ -83,15 +82,10 @@
//鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
, totalAmount, param.getSubscribeChargingCapacity(), param.getOpenId());
- if (null == c3mOrderEntity) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｈ浣跨敤!");
- }
- param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
- param.setTotalAmount(c3mOrderEntity.getTotalAmount());
- String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
+ String s = WxFastPayService.parseWxAmount(c3mOrderEntity.getTotalAmount().toString());
//鐢熸垚寰俊棰勪粯璁㈠崟
- SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay(request,"鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", c3mOrderEntity.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
return ResponseUtil.success(result);
}
--
Gitblit v1.9.3