From 52a3bda95de2e73e5958644f57b2a3d32168a4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 22 八月 2022 16:04:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 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 afe5064..79c16f1 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
@@ -140,27 +140,26 @@
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
Integer subscribeChargingCapacity, String wxCode) {
-
- // 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
- String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
- if (null != chargingJson) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
- }
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
- if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
+ //鍏呯數妗╂鍦ㄥ厖鐢典腑
+ if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
+ throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
+
+ //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
if (c3mOrder != null) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
+ c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+ updateById(c3mOrder);
}
+
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
- return null;
+ throw new BusinessException("鍏呯數妗╃伅鏉嗕俊鎭笉瀛樺湪!");
}
- // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
+ // 鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
streetlightId,
pole.getDeviceCode(),
@@ -169,7 +168,6 @@
totalAmount,
subscribeChargingCapacity
);
- boolean b = true;
c3mOrderEntity.setOrderId(snowflake.nextId());
c3mOrderEntity.setC3Mac(c3m.getC3Name());
c3mOrderEntity.setPoleId(streetlightId);
@@ -180,10 +178,15 @@
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
- if (b) {
- this.save(c3mOrderEntity);
+ //
+ c3mOrderEntity.setC3Name("鍒涘缓璁㈠崟");
+
+
+ if (save(c3mOrderEntity)) {
+ return c3mOrderEntity;
+ } else {
+ throw new BusinessException("鍒涘缓璁㈠崟澶辫触,璇烽噸鏂版壂鐮�!");
}
- return b ? c3mOrderEntity : null;
}
/**
@@ -194,6 +197,8 @@
String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
C3mOrder userOrder = getByOrderSn(orderSn);
+ userOrder.setC3Name("鍥炶皟鎴愬姛");
+ updateById(userOrder);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
}
@@ -309,8 +314,12 @@
public void deleteOrderListByCreateTime() {
// 鑾峰彇褰撳墠鏃堕棿鎴�
Long time = System.currentTimeMillis();
+
+ //褰撳墠鏃堕棿鍑忓幓10鍒嗛挓
+ Long timeMinus10 = time - 600000;
+
//鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
- remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
+ remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
}
/**
--
Gitblit v1.9.3