|
@@ -331,22 +331,22 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
|
|
|
return videoCnt;
|
|
|
}
|
|
|
KuaishouChannel usedchannel = null;
|
|
|
- if (useChannel == 1 && !"group".equals(level)) {
|
|
|
- usedchannel = channelService.queryUsedChannel(accountId, newCampaignId, level);
|
|
|
- if (Check.isNull(usedchannel)) {
|
|
|
- if ("account".equals(level)) {
|
|
|
- usedchannel = channel;
|
|
|
- } else {
|
|
|
- return videoCnt;
|
|
|
+ if (useChannel == 1) {
|
|
|
+ strategy.setMaterialKeyword(null);
|
|
|
+ if (!"group".equals(level)) {
|
|
|
+ usedchannel = channelService.queryUsedChannel(accountId, newCampaignId, level);
|
|
|
+ if (Check.isNull(usedchannel)) {
|
|
|
+ if ("account".equals(level)) {
|
|
|
+ usedchannel = channel;
|
|
|
+ } else {
|
|
|
+ return videoCnt;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<KuaishouChannelItems> items = usedchannel.getItems();
|
|
|
+ if (!Check.isNull(items) && !items.isEmpty()) {
|
|
|
+ strategy.setMaterialKeyword(items.get(0).getKeyword());
|
|
|
}
|
|
|
}
|
|
|
- List<KuaishouChannelItems> items = usedchannel.getItems();
|
|
|
- if (!Check.isNull(items) && !items.isEmpty()) {
|
|
|
- strategy.setMaterialKeyword(items.get(0).getKeyword());
|
|
|
- }
|
|
|
- }
|
|
|
- if ("group".equals(level)) {
|
|
|
- strategy.setMaterialKeyword(null);
|
|
|
}
|
|
|
List<KuaiShouVideoGet> newVideos = getVideosByParams(strategy, startTime, endTime, null, createType, videoCnt);
|
|
|
if (null == newVideos || newVideos.isEmpty()) {
|
|
@@ -687,22 +687,22 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
|
|
|
return;
|
|
|
}
|
|
|
KuaishouChannel usedchannel = null;
|
|
|
- if (useChannel == 1 && !"group".equals(level)) {
|
|
|
- usedchannel = channelService.queryUsedChannel(accountId, newCampaignId, level);
|
|
|
- if (Check.isNull(usedchannel)) {
|
|
|
- if ("account".equals(level)) {
|
|
|
- usedchannel = channel;
|
|
|
- } else {
|
|
|
- return;
|
|
|
+ if (useChannel == 1) {
|
|
|
+ strategy.setMaterialKeyword(null);
|
|
|
+ if (!"group".equals(level)) {
|
|
|
+ usedchannel = channelService.queryUsedChannel(accountId, newCampaignId, level);
|
|
|
+ if (Check.isNull(usedchannel)) {
|
|
|
+ if ("account".equals(level)) {
|
|
|
+ usedchannel = channel;
|
|
|
+ } else {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<KuaishouChannelItems> items = usedchannel.getItems();
|
|
|
+ if (!Check.isNull(items) && !items.isEmpty()) {
|
|
|
+ strategy.setMaterialKeyword(items.get(0).getKeyword());
|
|
|
}
|
|
|
}
|
|
|
- List<KuaishouChannelItems> items = usedchannel.getItems();
|
|
|
- if (!Check.isNull(items) && !items.isEmpty()) {
|
|
|
- strategy.setMaterialKeyword(items.get(0).getKeyword());
|
|
|
- }
|
|
|
- }
|
|
|
- if ("group".equals(level)) {
|
|
|
- strategy.setMaterialKeyword(null);
|
|
|
}
|
|
|
List<KuaiShouVideoGet> allVideos = getVideosByParams(strategy, startTime, endTime, null, createType, videoCnt);
|
|
|
if (null == allVideos) {
|