|
|
@@ -817,7 +817,8 @@ public class CoreServiceImpl implements CoreService {
|
|
|
gzhPushParam.setAccountId(planAccount.getAccountId());
|
|
|
gzhPushParam.setPushType(planAccount.getPushType());
|
|
|
gzhPushParam.setPushScheduleTimestamp(System.currentTimeMillis());
|
|
|
- if (planAccount.getIsSpecialSetting() != 1 && StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
|
|
|
+ if (planAccount.getIsSpecialSetting() != 1 && StringUtils.isNotEmpty(planAccount.getPublishPushTime())
|
|
|
+ && !planAccount.getPushType().equals(PublishGzhPushTypeEnum.auto_publish.getVal())) {
|
|
|
String dateTimeStr = TimeZoneUtil.todayYMD(TimeZoneUtil.Timezone.china) + " " + planAccount.getPublishPushTime();
|
|
|
gzhPushParam.setPushScheduleTimestamp(TimeZoneUtil.getDateStrTimestamp(dateTimeStr, "yyyy-MM-dd HH:mm:ss", TimeZoneUtil.Timezone.china));
|
|
|
} else {
|
|
|
@@ -1051,7 +1052,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
continue;
|
|
|
}
|
|
|
if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()) ||
|
|
|
- Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_publish.getVal())||
|
|
|
+ Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_publish.getVal()) ||
|
|
|
Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())) {
|
|
|
planAccountService.updateStatus(2, planAccountId);
|
|
|
}
|