|
@@ -624,8 +624,8 @@ public class CoreServiceImpl implements CoreService {
|
|
|
boolean isGzhGroupPushPlan = Objects.nonNull(planAccount.getPushType())
|
|
boolean isGzhGroupPushPlan = Objects.nonNull(planAccount.getPushType())
|
|
|
&& (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal())
|
|
&& (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal())
|
|
|
|| Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal()));
|
|
|| Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal()));
|
|
|
- boolean isInfinitePublishPlan = Objects.equals(planAccount.getPushType(),
|
|
|
|
|
- PublishGzhPushTypeEnum.INFINITE_PUBLISH_PUSH_DRAFT.getVal());
|
|
|
|
|
|
|
+ boolean isInfinitePublishPlan = Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_publish.getVal())
|
|
|
|
|
+ || Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.INFINITE_PUBLISH_PUSH_DRAFT.getVal());
|
|
|
boolean flag = true;
|
|
boolean flag = true;
|
|
|
// 固定日期
|
|
// 固定日期
|
|
|
if (planAccount.getPublishRate() == 1) {
|
|
if (planAccount.getPublishRate() == 1) {
|
|
@@ -956,6 +956,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* default流程:通过视频池或匹配视频获取小程序卡片
|
|
* default流程:通过视频池或匹配视频获取小程序卡片
|
|
|
|
|
+ *
|
|
|
* @param updateMatch 是否更新匹配内容(仅回退流程需要,替换标题封面场景不需要)
|
|
* @param updateMatch 是否更新匹配内容(仅回退流程需要,替换标题封面场景不需要)
|
|
|
*/
|
|
*/
|
|
|
private List<PublishMiniprogram> getDefaultPublishMiniprograms(PublishContent publishContent, PlanAccount planAccount, boolean updateMatch) {
|
|
private List<PublishMiniprogram> getDefaultPublishMiniprograms(PublishContent publishContent, PlanAccount planAccount, boolean updateMatch) {
|
|
@@ -1574,7 +1575,8 @@ public class CoreServiceImpl implements CoreService {
|
|
|
&& !pushStatusVO.getErrorMsg().contains("48004")
|
|
&& !pushStatusVO.getErrorMsg().contains("48004")
|
|
|
&& !pushStatusVO.getErrorMsg().contains("50002")
|
|
&& !pushStatusVO.getErrorMsg().contains("50002")
|
|
|
&& !pushStatusVO.getErrorMsg().contains("61003")
|
|
&& !pushStatusVO.getErrorMsg().contains("61003")
|
|
|
- && !pushStatusVO.getErrorMsg().contains("所有分组均发表失败")) {
|
|
|
|
|
|
|
+ && !pushStatusVO.getErrorMsg().contains("所有分组均发表失败")
|
|
|
|
|
+ && !Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_publish.getVal())) {
|
|
|
String alertKey = "push_error_alert:" + planAccount.getPlanId() + ":" + planAccount.getAccountName() + ":" + DigestUtils.md5Hex(pushStatusVO.getErrorMsg());
|
|
String alertKey = "push_error_alert:" + planAccount.getPlanId() + ":" + planAccount.getAccountName() + ":" + DigestUtils.md5Hex(pushStatusVO.getErrorMsg());
|
|
|
if (redisTemplate.opsForValue().get(alertKey) == null) {
|
|
if (redisTemplate.opsForValue().get(alertKey) == null) {
|
|
|
log.error("push error pushId={} msg={}", pushId, pushStatusVO.getErrorMsg());
|
|
log.error("push error pushId={} msg={}", pushId, pushStatusVO.getErrorMsg());
|