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

Merge branch 'V2.0.1' into test

zhaoxian преди 3 години
родител
ревизия
380cd16893

+ 14 - 13
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouAccountAutoDoServiceImpl.java

@@ -2431,19 +2431,6 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
         }
         String nowDate = DateUtils.formatDate(new Date(), "yy-MMdd");
         if ("plan".equals(type)) {
-            if (wildcard.contains("{{序号}}")) {
-                Integer count = 0;
-                String redisKey = strategy.getAccountId() + "_planCnt";
-                Integer redisValue = (Integer) redisUtil.get(redisKey);
-                if (Check.isNull(redisValue)) {
-                    count = 1;
-                    redisUtil.set(redisKey, count);
-                } else {
-                    count = redisValue + 1;
-                    redisUtil.set(redisKey, count);
-                }
-                wildcard = wildcard.replace("{{序号}}", count + "");
-            }
             //创意制作方式
             if (strategy.getUnitType() == 4) {
                 wildcard = wildcard.replace("{{自定义}}", "自定义");
@@ -2455,6 +2442,20 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
             } else {
                 wildcard = wildcard + "-" + nowDate;
             }
+            if (!wildcard.contains("{{序号}}")) {
+                wildcard = wildcard + "{{序号}}";
+            }
+            Integer count = 0;
+            String redisKey = strategy.getAccountId() + "_planCnt";
+            Integer redisValue = (Integer) redisUtil.get(redisKey);
+            if (Check.isNull(redisValue)) {
+                count = 1;
+                redisUtil.set(redisKey, count);
+            } else {
+                count = redisValue + 1;
+                redisUtil.set(redisKey, count);
+            }
+            wildcard = wildcard.replace("{{序号}}", count + "");
         } else if ("unit".equals(type)) {
             String targetName = KuaishouAutoTypeEnum.getNameByType(strategy.getUnitType().toString() + videoType.toString());
             wildcard = wildcard.replace("{{自定义}}", targetName);