Browse Source

Merge branch 'master' into jiaoyang

yumeng 4 năm trước cách đây
mục cha
commit
b8eb5b3faa

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/KuaiShouAppMultipleBids.java

@@ -59,6 +59,7 @@ public class KuaiShouAppMultipleBids {
     @Excel(name = "监测链接", width = 15)
     @Excel(name = "监测链接", width = 15)
     @ApiModelProperty(value = "监测链接")
     @ApiModelProperty(value = "监测链接")
     private String trackUrl;
     private String trackUrl;
+    private String channelCode;
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */

+ 9 - 8
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouCreateCreativeServiceImpl.java

@@ -1426,9 +1426,8 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
     @Autowired
     @Autowired
     private IKuaiShouAppListService appListService;
     private IKuaiShouAppListService appListService;
 
 
-    private String getName(String wildcard, AiKuaishouAdvertiserStrategy strategy, Integer createType, String materialName, String type, Long campaignId, Long appId) {
-
 
 
+    private String getName(String wildcard, AiKuaishouAdvertiserStrategy strategy, Integer createType, String materialName, String type, Long campaignId, Long appId) {
         if (wildcard.contains("{{应用名称}}") || wildcard.contains("{{应用标记}}")) {
         if (wildcard.contains("{{应用名称}}") || wildcard.contains("{{应用标记}}")) {
             KuaiShouAppList getAppInfo = appListService.getAppInfo(strategy.getAccountId(), appId);
             KuaiShouAppList getAppInfo = appListService.getAppInfo(strategy.getAccountId(), appId);
             if (!Check.isNull(getAppInfo)) {
             if (!Check.isNull(getAppInfo)) {
@@ -1439,8 +1438,6 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
                 wildcard = wildcard.replace("{{应用标记}}", "");
                 wildcard = wildcard.replace("{{应用标记}}", "");
             }
             }
         }
         }
-
-
         if (wildcard.contains("{{创意制作方式}}")) {
         if (wildcard.contains("{{创意制作方式}}")) {
             if (strategy.getUnitType() == 4) {
             if (strategy.getUnitType() == 4) {
                 wildcard = wildcard.replace("{{创意制作方式}}", "自定义");
                 wildcard = wildcard.replace("{{创意制作方式}}", "自定义");
@@ -1460,6 +1457,14 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
                 wildcard = wildcard.replace("{{素材名称}}", materialName);
                 wildcard = wildcard.replace("{{素材名称}}", materialName);
             }
             }
         }
         }
+        if (wildcard.contains("{{渠道号}}")) {
+            KuaiShouAppMultipleBids multipleBids = kuaiShouAppMultipleBidsService.getInfoByAccountAndAppId(strategy.getAccountId(), appId);
+            if (!Check.isNull(multipleBids)) {
+                wildcard = wildcard.replace("{{渠道号}}", multipleBids.getChannelCode());
+            } else {
+                wildcard = wildcard.replace("{{渠道号}}", "");
+            }
+        }
         if (!wildcard.contains("{{自定义}}")) {
         if (!wildcard.contains("{{自定义}}")) {
             wildcard = wildcard + "{{自定义}}";
             wildcard = wildcard + "{{自定义}}";
         }
         }
@@ -1474,12 +1479,8 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
         } else if ("unit".equals(type)) {
         } else if ("unit".equals(type)) {
             wildcard = wildcard.replace("{{日期}}", nowDate);
             wildcard = wildcard.replace("{{日期}}", nowDate);
         }
         }
-
-
         String targetName = KuaishouCreativeMatTypeEnum.getNameByType(strategy.getUnitType().toString() + createType.toString());
         String targetName = KuaishouCreativeMatTypeEnum.getNameByType(strategy.getUnitType().toString() + createType.toString());
         wildcard = wildcard.replace("{{自定义}}", targetName);
         wildcard = wildcard.replace("{{自定义}}", targetName);
-
-
         if (!Check.isNull(campaignId)) {
         if (!Check.isNull(campaignId)) {
             Integer count = null;
             Integer count = null;
             if (null != strategy.getSingleAppid() && strategy.getSingleAppid() == 0 && strategy.getMultipleBids() == 0) {
             if (null != strategy.getSingleAppid() && strategy.getSingleAppid() == 0 && strategy.getMultipleBids() == 0) {