|
|
@@ -243,9 +243,8 @@ public class CoreServiceImpl implements CoreService {
|
|
|
planAccount.setPublishWindowStart(accountSpecialSettings.getPublishPushTime());
|
|
|
//保证手动推送的结束时间在推送开始时间之后
|
|
|
planAccount.setPublishWindowEnd("23:00:00");
|
|
|
- } else {
|
|
|
- planAccount.setPublishPushTime(accountSpecialSettings.getPublishPushTime());
|
|
|
}
|
|
|
+ planAccount.setPublishPushTime(accountSpecialSettings.getPublishPushTime());
|
|
|
planAccount.setPublishPreNum(accountSpecialSettings.getPublishNum());
|
|
|
planAccount.setPublishNum(accountSpecialSettings.getPublishNum());
|
|
|
int size = 0;
|
|
|
@@ -688,7 +687,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
gzhPushParam.setAccountId(planAccount.getAccountId());
|
|
|
gzhPushParam.setPushType(planAccount.getPushType());
|
|
|
gzhPushParam.setPushScheduleTimestamp(System.currentTimeMillis());
|
|
|
- if (StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
|
|
|
+ if (planAccount.getIsSpecialSetting() != 1 && StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
|
|
|
String dateTimeStr = TimeZoneUtil.todayYMD(TimeZoneUtil.Timezone.china) + " " + planAccount.getPublishPushTime();
|
|
|
gzhPushParam.setPushScheduleTimestamp(TimeZoneUtil.getDateStrTimestamp(dateTimeStr, "yyyy-MM-dd HH:mm:ss", TimeZoneUtil.Timezone.china));
|
|
|
} else {
|
