预约订单

service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -116,13 +116,13 @@ public class ChargeServiceImpl implements ChargeService {
         // 预约充电队列更新
         var chargeOrder = chargeOrderService.lambdaQuery().eq(ChargeOrder::getStartChargeSeq, startChargeSeq)
                 .eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中).one();
-        if(chargeOrder==null){
+        if (chargeOrder == null) {
             throw new BusinessException("预约订单不存在");
         }
         chargeOrder.setStartTime(startTime);
         chargeOrder.setEndTime(null);
-        chargeOrderService.lambdaUpdate().eq(ChargeOrder::getStartChargeSeq,startChargeSeq)
-                .set(ChargeOrder::getStartTime,startTime).set(ChargeOrder::getEndTime,null).update();
+        chargeOrderService.lambdaUpdate().eq(ChargeOrder::getStartChargeSeq, startChargeSeq)
+                .set(ChargeOrder::getStartTime, startTime).set(ChargeOrder::getEndTime, null).update();
         // 删除队列中原来的数据
         startDelayService.removeFromOrderDelayQueue(startChargeSeq);
         stopDelayService.removeFromOrderDelayQueue(startChargeSeq);
@@ -334,6 +334,9 @@ public class ChargeServiceImpl implements ChargeService {
         var userId = StpUtil.getLoginIdAsLong();
         var chargeOrder = chargeOrderService.getChargingOrderByUserId(userId);
         if (chargeOrder != null) {
+            if (chargeOrder.getChargeStatus().equals(ChargeOrder.CHARGE_STATUS_预约中)) {
+                return chargeOrder;
+            }
             // 查询充电
             var startChargeSeq = chargeOrder.getStartChargeSeq();
             var data = enPlusService.queryEquipChargeStatus(startChargeSeq);