合并分支 'qa' 到 'master'

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityTaskClockServiceImpl.java

@@ -164,7 +164,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
             // 检查当前时间是否在打卡要求的时间内
             Date requiredLockTime = taskClockDO.getRequiredlockTime();
             // 计算15分钟以后得时间
-            Date latestRequiredLockTime = DateUtil.offsetMinute(requiredLockTime, 15).toJdkDate();
+            Date latestRequiredLockTime = DateUtil.offsetMinute(requiredLockTime, 30).toJdkDate();
             if (new Date().compareTo(requiredLockTime) < 0 || new Date().compareTo(latestRequiredLockTime) > 0) {
                 throw new IllegalArgumentException("当前时间不在打卡要求的时间内");
             }

src/main/java/com/wangxiaolu/promotion/xxljobtask/ActivityStautsHandler.java

@@ -65,7 +65,7 @@ public class ActivityStautsHandler {
     }
     @XxlJob("sendSubscribeMessage")
     public void sendSubscribeMessage() {
-        DateTime undoDateTime = DateUtil.offsetMinute(new Date(), -15);
+        DateTime undoDateTime = DateUtil.offsetMinute(new Date(), -30);
         /**
          * 处理未开始的随机任务状态更新
          * <p>