Selaa lähdekoodia

Merge branch 'V2.0.1'

zhaoxian 2 vuotta sitten
vanhempi
commit
b97f13f4e0

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

@@ -2218,6 +2218,11 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
                 target.put("paid_audience", paidAudience);
             }
 
+            // 过滤已转化人群
+            if (!Check.isNull(templateTarget.getFilterConvertedLevel())) {
+                target.put("filter_converted_level", templateTarget.getFilterConvertedLevel());
+            }
+
             if (sceneId != 5) {
                 // 商业兴趣类型
                 if (null != templateTarget.getBusinessInterestType()) {
@@ -2238,10 +2243,6 @@ public class AiKuaishouAccountAutoDoServiceImpl implements IAiKuaishouAccountAut
                 if (!Check.isNull(interestVideoString) && !interestVideoString.isEmpty()) {
                     target.put("interest_video", interestVideoString);
                 }
-                // 过滤已转化人群
-                if (!Check.isNull(templateTarget.getFilterConvertedLevel())) {
-                    target.put("filter_converted_level", templateTarget.getFilterConvertedLevel());
-                }
 
                 // 开启智能扩量
                 Integer isOpen = templateTarget.getIsOpen();

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

@@ -1417,10 +1417,8 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
         if (null != strategy.getDevicePrice() && !"".equals(strategy.getDevicePrice()) && !"[]".equals(strategy.getDevicePrice())) {
             targetJsonObject.put("device_price", JSON.parseArray(strategy.getDevicePrice()));
         }
-        if (sceneId != 5) {
-            if (null != strategy.getFilterConvertedLevel() && strategy.getFilterConvertedLevel() != 0) {
-                targetJsonObject.put("filter_converted_level", strategy.getFilterConvertedLevel());
-            }
+        if (null != strategy.getFilterConvertedLevel() && strategy.getFilterConvertedLevel() != 0) {
+            targetJsonObject.put("filter_converted_level", strategy.getFilterConvertedLevel());
         }
 
         // APP行为-按APP名称
@@ -1560,6 +1558,12 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
         if (null != devicePriceString && !"".equals(devicePriceString.trim())) {
             target.put("device_price", JSON.parseArray(devicePriceString));
         }
+
+        // 过滤已转化人群
+        if (null != strategy.getFilterConvertedLevel()) {
+            target.put("filter_converted_level", strategy.getFilterConvertedLevel());
+        }
+
         if (sceneId != 5) {
             // 商业兴趣类型
             if (null != strategy.getBusinessInterestType()) {
@@ -1580,10 +1584,6 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
             if (null != interestVideoString && !"".equals(interestVideoString.trim())) {
                 target.put("interest_video", JSON.parseArray(interestVideoString));
             }
-            // 过滤已转化人群
-            if (null != strategy.getFilterConvertedLevel()) {
-                target.put("filter_converted_level", strategy.getFilterConvertedLevel());
-            }
 
             // 开启智能扩量
             if (null != strategy.getIsOpen() && strategy.getIsOpen() == 1) {

+ 4 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java

@@ -579,6 +579,9 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
         if (!Check.isNull(unitJson.getJSONArray("device_price"))) {
             target.put("device_price", unitJson.getJSONArray("device_price")); // 设备价格
         }
+        if (!Check.isNull(unitJson.getInteger("filter_converted_level"))) {
+            target.put("filter_converted_level", unitJson.getInteger("filter_converted_level")); // APP行为-按APP名称
+        }
         if (sceneId != 5) {
             if (!Check.isNull(unitJson.getInteger("business_interest_type"))) {
                 target.put("business_interest_type", unitJson.getInteger("business_interest_type")); // 商业兴趣类型
@@ -599,11 +602,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
         if (!Check.isNull(unitJson.getJSONArray("app_ids"))) {
             target.put("app_ids", unitJson.getJSONArray("app_ids")); // APP行为-按APP名称
         }
-        if (sceneId != 5) {
-            if (!Check.isNull(unitJson.getInteger("filter_converted_level"))) {
-                target.put("filter_converted_level", unitJson.getInteger("filter_converted_level")); // APP行为-按APP名称
-            }
-        }
+
         if (!Check.isNull(unitJson.getJSONArray("population"))) {
             target.put("population", unitJson.getJSONArray("population")); // 人群包定向
         }

+ 13 - 13
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/BatchServiceImpl.java

@@ -296,11 +296,11 @@ public class BatchServiceImpl implements IBatchService {
             targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
         }
 
+        //过滤已转化人群纬度
+        if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
+            targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
+        }
         if (sceneId != 5) {
-            //过滤已转化人群纬度
-            if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
-                targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
-            }
             //商业兴趣类型
             if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
                 targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
@@ -637,10 +637,10 @@ public class BatchServiceImpl implements IBatchService {
             if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
                 targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
             }
+            if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
+                targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
+            }
             if (sceneId != 5) {
-                if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
-                    targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
-                }
                 //商业兴趣类型
                 if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
                     targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
@@ -962,10 +962,10 @@ public class BatchServiceImpl implements IBatchService {
                     if (!Check.isNull(groupTarget.getDevicePrice())) {
                         targetJson.put("device_price", JSONArray.parseArray(groupTarget.getDevicePrice()));
                     }
+                    if (!Check.isNull(groupTarget.getFilterConvertedLevel())) {
+                        targetJson.put("filter_converted_level", groupTarget.getFilterConvertedLevel());
+                    }
                     if (sceneId != 5) {
-                        if (!Check.isNull(groupTarget.getFilterConvertedLevel())) {
-                            targetJson.put("filter_converted_level", groupTarget.getFilterConvertedLevel());
-                        }
 
                         //商业兴趣类型
                         if (!Check.isNull(groupTarget.getBusinessInterestType())) {
@@ -1886,10 +1886,10 @@ public class BatchServiceImpl implements IBatchService {
                 targetJson.put("third_platform_code", requestJson.getJSONArray("thirdPlatformCode"));
             }
 
+            if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
+                targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
+            }
             if (scene != 5) {
-                if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
-                    targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
-                }
 
                 //商业兴趣类型
                 if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouCampaignCopyDataServiceImpl.java

@@ -327,11 +327,11 @@ public class KuaishouCampaignCopyDataServiceImpl extends ServiceImpl<KuaishouCam
                         targetJson.put("third_platform_code", target.getJSONArray("thirdPlatformCode"));
                     }
 
+                    //过滤已转化人群纬度
+                    if (!Check.isNull(target.getInteger("filterConvertedLevel"))) {
+                        targetJson.put("filter_converted_level", target.getInteger("filterConvertedLevel"));
+                    }
                     if (sceneId != 5) {
-                        //过滤已转化人群纬度
-                        if (!Check.isNull(target.getInteger("filterConvertedLevel"))) {
-                            targetJson.put("filter_converted_level", target.getInteger("filterConvertedLevel"));
-                        }
                         //商业兴趣类型
                         if (!Check.isNull(target.getInteger("businessInterestType"))) {
                             targetJson.put("business_interest_type", target.getInteger("businessInterestType"));

+ 9 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouStrategyServiceImpl.java

@@ -7,7 +7,11 @@ import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouStrategy;
 import cn.com.ctop.kuaishou.modules.batch.entity.kuaishoustrategycampaignRel;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaishouStrategyMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.*;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouStrategyService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -401,11 +405,11 @@ public class KuaishouStrategyServiceImpl extends ServiceImpl<KuaishouStrategyMap
             targetJson.put("device_price", groupJson.getJSONArray("devicePrice"));
         }
 
+        //过滤已转化人群纬度
+        if (!Check.isNull(groupJson.getInteger("filterConvertedLevel"))) {
+            targetJson.put("filter_converted_level", groupJson.getInteger("filterConvertedLevel"));
+        }
         if (sceneId != 5) {
-            //过滤已转化人群纬度
-            if (!Check.isNull(groupJson.getInteger("filterConvertedLevel"))) {
-                targetJson.put("filter_converted_level", groupJson.getInteger("filterConvertedLevel"));
-            }
             //商业兴趣类型
             if (!Check.isNull(groupJson.getInteger("businessInterestType"))) {
                 targetJson.put("business_interest_type", groupJson.getInteger("businessInterestType"));