Merge branch 'master' into dev

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

@@ -78,6 +78,7 @@ public class StartChargeDelayJob implements DelayService<DelayChargeOrder> {
                     // 线程休眠100ms
                     Thread.sleep(100);
                     delayedItem = START_DELAY_QUEUE.take();
+                    log.info("出队预约充电订单：{}，队列剩余：{}", delayedItem.data.getStartChargeSeq(), START_DELAY_QUEUE.size() - 1);
                     // 启动充电
                     var order = delayedItem.data;
                     threadLocal.set(order.getStartChargeSeq());

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

@@ -176,6 +176,7 @@ public class ChargeServiceImpl implements ChargeService {
                     .set(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_已取消)
                     .eq(ChargeOrder::getStartChargeSeq, chargeOrder.getStartChargeSeq())
                     .update();
+            LOGGER.info("取消/清除预约订单：{}", chargeOrder.getStartChargeSeq());
         } else {
             LOGGER.info("用户没有预约中的订单");
         }