From a648f3e08210a1ed04bf819cccedc56e5afc24c3 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 27 六月 2022 17:51:50 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 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 eb1472f..7260cfe 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
@@ -13,10 +13,12 @@
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
import com.sandu.ximon.admin.service.C3ChargingService;
import com.sandu.ximon.admin.service.C3mOrderService;
+import com.sandu.ximon.admin.utils.AliPayUtils;
import com.sandu.ximon.admin.utils.ConfigCheckUtils;
import com.sandu.ximon.dao.domain.AliConfigEntity;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
+import com.sandu.ximon.dao.enums.OrderType;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +28,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;
@@ -66,15 +67,15 @@
*/
@PostMapping("/advancePay")
public ResponseVO<Object> advancePayOrder(@RequestBody PayParam param) {
- if (param.getTotalAmount() == 0d) {
- throw new BusinessException("閲戦涓嶈兘涓�0");
+ if (param.getTotalAmount() < 0) {
+ throw new BusinessException("閲戦蹇呴』澶т簬0");
}
// C3鍏呯數妗╁疄浣�
C3mCharging c3m = c3mService.getC3mByPoleId(param.getPoleId());
if (null == c3m) {
throw new BusinessException("鏈壘鍒板綋鍓嶅厖鐢垫々");
}
- C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, param.getOrderType()
+ C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
, param.getTotalAmount(), param.getSubscribeChargingCapacity());
if (null == c3mOrderEntity) {
throw new BusinessException("璇ュ厖鐢垫々姝ｈ浣跨敤!");
@@ -82,10 +83,11 @@
// return R.ok().put("outTradeNo",c3mOrderEntity.getOutTradeNo())
// .put("totalAmount",totalAmount);
- Map map = new HashMap();
- map.put("outTradeNo", c3mOrderEntity.getOutTradeNo());
- map.put("totalAmount", param.getTotalAmount());
- return ResponseUtil.success(map);
+ param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
+ param.setTotalAmount(c3mOrderEntity.getTotalAmount());
+ String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(),Integer.valueOf(s) , param.getPoleId());
+ return ResponseUtil.success(result);
}
@@ -149,14 +151,33 @@
return ResponseUtil.success("鏀粯瀹屾垚");
}
- @RequestMapping("/wxpay")
- public ResponseVO<Object> c3Wxpay(@RequestBody PayParam param) {
+// @RequestMapping("/wxpay")
+// public ResponseVO<Object> c3Wxpay(@RequestBody PayParam param) {
+//
+// //String result = wxPayService.miniAppPay(outTradeNo, totalAmount, streetlightId);
+// SortedMap<Object, Object> result = wxPayService.appPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), param.getWxPayTotalAmount(), param.getPoleId(),c3mOrderEntity);
+//
+// return ResponseUtil.success(result);
+// }
- //String result = wxPayService.miniAppPay(outTradeNo, totalAmount, streetlightId);
- SortedMap<Object, Object> result = wxPayService.appPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), param.getWxPayTotalAmount(), param.getPoleId());
- return ResponseUtil.success(result);
+ @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