fix bug 筛选订单加入userId

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

@@ -202,7 +202,11 @@ public class ChargeServiceImpl implements ChargeService {
         var account = checkCharge(userId, connectorId, isBooking, startTime);
 
         // 是否有之前预约充电创建的订单记录，有则直接用，没有则创建
-        ChargeOrder order = chargeOrderService.lambdaQuery().eq(ChargeOrder::getConnectorId, connectorId).in(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_已取消, ChargeOrder.CHARGE_STATUS_预约中).one();
+        ChargeOrder order = chargeOrderService.lambdaQuery()
+                .eq(ChargeOrder::getUserId, userId)
+                .eq(ChargeOrder::getConnectorId, connectorId)
+                .in(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_已取消, ChargeOrder.CHARGE_STATUS_预约中)
+                .one();
 
         if (order == null) {
             // 充电订单号/设备认证号
@@ -242,7 +246,14 @@ public class ChargeServiceImpl implements ChargeService {
             if (!CommUtil.isEmptyOrNull(endTime)) {
                 order.setEndTime(endTime);
             }
-            chargeOrderService.lambdaUpdate().set(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中).set(ChargeOrder::getIsBooking, order.getIsBooking()).set(ChargeOrder::getStartTime, startTime).set(!CommUtil.isEmptyOrNull(endTime), ChargeOrder::getEndTime, endTime).eq(ChargeOrder::getStartChargeSeq, order.getStartChargeSeq()).update();
+            chargeOrderService.lambdaUpdate()
+                    .set(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中)
+                    .set(ChargeOrder::getIsBooking, order.getIsBooking())
+                    .set(ChargeOrder::getStartTime, startTime)
+                    .set(!CommUtil.isEmptyOrNull(endTime), ChargeOrder::getEndTime, endTime)
+                    .eq(ChargeOrder::getUserId, userId)
+                    .eq(ChargeOrder::getStartChargeSeq, order.getStartChargeSeq())
+                    .update();
 
             var delayChargeOrder = new DelayChargeOrder();
             BeanUtils.copyProperties(order, delayChargeOrder);