Merge branch 'master' into dev

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

@@ -154,9 +154,9 @@ public class StartChargeDelayJob implements DelayService<DelayChargeOrder> {
 
     @Override
     public boolean addToDelayQueue(DelayChargeOrder delayChargeOrder) {
-        // 如果预约开始时间小于等于当前时间，则将预约开始时间延后10S
+        // 如果预约开始时间小于等于当前时间，则将预约开始时间从当前时间延后5S
         if (delayChargeOrder.getStartTime().isBefore(LocalDateTime.now())) {
-            delayChargeOrder.setStartTime(delayChargeOrder.getStartTime().plusSeconds(10));
+            delayChargeOrder.setStartTime(LocalDateTime.now().plusSeconds(5));
         }
         DelayedItem<DelayChargeOrder> orderDelayed = new DelayedItem<>(delayChargeOrder, delayChargeOrder.getStartTime());
         return START_DELAY_QUEUE.add(orderDelayed);