|
@@ -1764,12 +1764,12 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
|
|
|
//计划下还可建的广告组数
|
|
|
toBeBuiltCnt = unitCnt - count;
|
|
|
//若比本次待建数少,则用本计划建满,剩余不做创建,下次执行
|
|
|
- if (toBeBuiltCnt < strategy.getToBeBuiltCnt()) {
|
|
|
+ if (toBeBuiltCnt > 0 && toBeBuiltCnt < strategy.getToBeBuiltCnt()) {
|
|
|
strategy.setToBeBuiltCnt(toBeBuiltCnt);
|
|
|
+ return data.getLong("campaignId");
|
|
|
}
|
|
|
- return data.getLong("campaignId");
|
|
|
}
|
|
|
- //判断是否扔可用创建计划
|
|
|
+ //判断是否扔可创建计划
|
|
|
if (planCnt > datas.size()) {
|
|
|
return createCampaign(strategy, token, videoType, uuid, channel);
|
|
|
}
|
|
@@ -2391,11 +2391,6 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
|
|
|
if (wildcard.contains("{{应用名称}}") || wildcard.contains("{{应用标记}}") || wildcard.contains("{{应用包名}}")) {
|
|
|
KuaiShouAppList getAppInfo = appListService.getAppInfo(strategy.getAccountId(), appId);
|
|
|
if (!Check.isNull(getAppInfo)) {
|
|
|
- if (!wildcard.contains("{{自定义}}")) {
|
|
|
- if (wildcard.contains("{{应用标记}}")) {
|
|
|
- wildcard = wildcard.replace("{{应用标记}}", "{{应用标记}}-{{自定义}}");
|
|
|
- }
|
|
|
- }
|
|
|
wildcard = wildcard.replace("{{应用名称}}", getAppInfo.getAppName());
|
|
|
wildcard = wildcard.replace("{{应用标记}}", getAppInfo.getAppVersion());
|
|
|
wildcard = wildcard.replace("{{应用包名}}", getAppInfo.getPackageName());
|