From 51720931d4b99ac874acc3b8e90305acf71e8c0c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 14:37:33 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index ecc51d0..4aa3b28 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -156,10 +156,8 @@
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
.eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
- if (c3mOrder != null) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
- }
- if (!c3mOrder.getUserCode().equals(wxCode)) {
+
+ if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
}
Pole pole = poleService.getById(streetlightId);
@@ -221,9 +219,6 @@
userOrder.setOutTradeNo(transactionId);
userOrder.setPayTimestamp(new Date().getTime());
userOrder.setOrderStatus(OrderStatusEnums.PAID.getCode());
- if (!updateById(userOrder)) {
- return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
- }
/**
* 璋冭捣寮�濮嬪厖鐢垫帴鍙�
*/
@@ -231,6 +226,10 @@
if (s.isEmpty() || s == null) {
throw new BusinessException("寮�鍚厖鐢靛け璐�");
}
+ userOrder.setChargingStates(0);
+ if (!updateById(userOrder)) {
+ return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
+ }
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
--
Gitblit v1.9.3