Merge branch 'master' into dev

miniapp/src/main/java/com/kym/miniapp/jobs/StartChargeDelayJob.java

@@ -84,7 +84,7 @@ public class StartChargeDelayJob implements DelayService<DelayChargeOrder> {
                     chargeService.queryStartCharge(order.getUserId(), order.getConnectorId(), null, false, null, null);
                     log.info("预约充电启动成功:用户:{}，订单号：{}，预约启动时间：{}", order.getUserId(), order.getStartChargeSeq(), order.getStartTime());
                     // 线程休眠100ms
-                    Thread.sleep(100);
+                    Thread.sleep(200);
                 } catch (Exception e) {
                     if (e instanceof InterruptedException) {
                         log.error("预约充电队列take异常", e);

miniapp/src/main/java/com/kym/miniapp/jobs/StopChargeDelayJob.java

@@ -78,7 +78,7 @@ public class StopChargeDelayJob implements DelayService<DelayChargeOrder> {
             DelayedItem<DelayChargeOrder> delayedItem;
             while (true) {
                 try {
-                    Thread.sleep(200);
+                    Thread.sleep(100);
                     delayedItem = STOP_DELAY_QUEUE.take();
                     // 停止充电
                     var order = delayedItem.data;
@@ -89,7 +89,7 @@ public class StopChargeDelayJob implements DelayService<DelayChargeOrder> {
                         chargeService.queryStopCharge(order.getUserId(), order.getConnectorId());
                         log.info("预约充电停止成功:用户:{}，订单号：{}，预约停止时间：{}", order.getUserId(), order.getStartChargeSeq(), order.getEndTime());
                         // 线程休眠100ms
-                        Thread.sleep(100);
+                        Thread.sleep(200);
                     } else {
                         log.error("预约充电停止异常:订单不匹配：原订单：{}，当前设备最新订单：{}", order.getStartChargeSeq(), currentChargeOrder.getStartChargeSeq());
                         throw new BusinessException("预约充电停止异常");