充电逻辑优化

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

@@ -204,7 +204,7 @@ public class ChargeServiceImpl implements ChargeService {
         ChargeOrder order = chargeOrderService.lambdaQuery()
                 .eq(ChargeOrder::getUserId, userId)
                 .eq(ChargeOrder::getConnectorId, connectorId)
-                .in(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_已取消, ChargeOrder.CHARGE_STATUS_预约中)
+                .eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中)
                 .one();
 
         if (order == null) {
@@ -330,7 +330,13 @@ public class ChargeServiceImpl implements ChargeService {
                 throw new BusinessException("预约充电启动时间不能超过未来24小时");
             }
             // 预约充电通过connectorId查询预约中的订单
-            var bookingOrder = chargeOrderService.lambdaQuery().eq(ChargeOrder::getUserId, userId).eq(ChargeOrder::getConnectorId, connectorId).eq(ChargeOrder::getIsBooking, ChargeOrder.IS_BOOKING_是).eq(ChargeOrder::getOrderStatus, ChargeOrder.ORDER_STATUS_未知).eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中).one();
+            var bookingOrder = chargeOrderService.lambdaQuery()
+                    .eq(ChargeOrder::getUserId, userId)
+                    .eq(ChargeOrder::getConnectorId, connectorId)
+                    .eq(ChargeOrder::getIsBooking, ChargeOrder.IS_BOOKING_是)
+                    .eq(ChargeOrder::getOrderStatus, ChargeOrder.ORDER_STATUS_未知)
+                    .eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中)
+                    .one();
             if (bookingOrder != null) {
                 LOGGER.error("用户：{}存在进行中的订单：{}", userId, bookingOrder.getStartChargeSeq());
                 throw new BusinessException(ResponseEnum.ORDER_IN_BOOKING);