|
@@ -212,8 +212,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
break; // 退出当前线程
|
|
|
}
|
|
|
//只匹配小程序文章不做处理
|
|
|
- if (matchContent.getSourceType() != null &&
|
|
|
- matchContent.getSourceType().equals(SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
|
|
|
+ if (Objects.equals(matchContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
|
|
|
MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
|
|
|
statusParam.setStatus(2);
|
|
|
statusParam.setPublishContentId(matchContent.getPublishContentId());
|
|
@@ -492,8 +491,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
List<PublishMiniprogram> publishMiniprogramList = publicContentService.getPublishMiniprograms(publishContent);
|
|
|
//不存在则重新生成
|
|
|
if (CollectionUtils.isEmpty(publishMiniprogramList)) {
|
|
|
- if (publishContent.getSourceType() != null &&
|
|
|
- Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
|
|
|
+ if (Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
|
|
|
List<VideoDetail> videoDetails = contentService.getOnlyMiniPublishVideoDetail(publishContent);
|
|
|
log.info("publishContentId={}, videoDetails={}", publishContent.getId(), videoDetails);
|
|
|
publishMiniprogramList = getPublishMiniprogramList(videoDetails, planAccount, publishContent);
|
|
@@ -543,8 +541,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
if (CollectionUtils.isEmpty(publishMiniprogramList)) {
|
|
|
return null;
|
|
|
}
|
|
|
- if (publishContent.getSourceType() == null ||
|
|
|
- !Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
|
|
|
+ if (!Objects.equals(publishContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
|
|
|
if (publishMiniprogramList.size() < 2) {
|
|
|
return null;
|
|
|
}
|