Преглед на файлове

批量创建--命名重复问题

zhaoxian преди 4 години
родител
ревизия
bd65a4b27f

+ 10 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouBatchCampaignPreviewServiceImpl.java

@@ -252,7 +252,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     }
                 }
                 campaignPreview.setId(null);
-                campaignPreview.setCampaignName(getName(campaignPreview.getCampaignName(), null, null, appId, null) + i);
+                campaignPreview.setCampaignName(getName(campaignPreview.getCampaignNameFormat(), null, null, appId, null) + i);
                 campaignPreviewMapper.insert(campaignPreview);
                 for (int j = 0; j < materialList.size(); j++) {
                     if (appAllocation == 3) {
@@ -278,7 +278,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     groupPreview.setAppId(appId);
                     groupPreview.setPlanId(campaignPreview.getId());
                     groupPreview.setTemplateId(targetIds.getLong(i));
-                    groupPreview.setUnitName(getName(groupPreview.getUnitName(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType()) + j);
+                    groupPreview.setUnitName(getName(groupPreview.getUnitNameFormat(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType()) + j);
                     groupPreview.setUrl(url);
                     groupPreviewMapper.insert(groupPreview);
                     JSONObject material = materialList.getJSONObject(j);
@@ -336,7 +336,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     }
                 }
                 campaignPreview.setId(null);
-                campaignPreview.setCampaignName(getName(campaignPreview.getCampaignName(), null, null, appId, null) + i);
+                campaignPreview.setCampaignName(getName(campaignPreview.getCampaignNameFormat(), null, null, appId, null) + i);
                 campaignPreviewMapper.insert(campaignPreview);
                 JSONObject material = materialList.getJSONObject(i);
                 JSONArray photoArr = material.getJSONArray("photoArr");
@@ -368,7 +368,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     groupPreview.setAppId(appId);
                     groupPreview.setPlanId(campaignPreview.getId());
                     groupPreview.setTemplateId(targetIds.getLong(j));
-                    groupPreview.setUnitName(getName(groupPreview.getUnitName(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType()) + j);
+                    groupPreview.setUnitName(getName(groupPreview.getUnitNameFormat(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType()) + j);
                     groupPreview.setUrl(url);
                     groupPreviewMapper.insert(groupPreview);
                     for (int k = 0; k < photoArr.size(); k++) {
@@ -569,14 +569,18 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     QueryWrapper<KuaiShouAppList> queryWrapper = new QueryWrapper();
                     queryWrapper.eq("app_id", appId);
                     KuaiShouAppList one = kuaiShouAppListService.getOne(queryWrapper);
-                    data.put(regName, one.getAppName());
+                    if (!Check.isNull(one)) {
+                        data.put(regName, one.getAppName());
+                    }
                 }
             } else if ("渠道号".equals(regName)) {
                 if (!Check.isNull(appId)) {
                     QueryWrapper<KuaiShouAppList> queryWrapper = new QueryWrapper();
                     queryWrapper.eq("app_id", appId);
                     KuaiShouAppList one = kuaiShouAppListService.getOne(queryWrapper);
-                    data.put(regName, one.getAppVersion());
+                    if (!Check.isNull(one)) {
+                        data.put(regName, one.getAppVersion());
+                    }
                 }
             } else if ("创意制作方式".equals(regName)) {
                 if (!Check.isNull(unitType)) {