yumeng 4 年 前
コミット
d085086029

+ 50 - 47
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/BatchServiceImpl.java

@@ -1456,7 +1456,10 @@ public class BatchServiceImpl implements IBatchService {
                 unitJson.put("scene_id", scene_id);
             }
 
-            Integer sceneId = Integer.valueOf(scene_id.get(0).toString());
+           /* if (!Check.isNull(scene_id)) {
+                Integer sceneId = Integer.valueOf(scene_id.get(0).toString());
+            }*/
+
 
             // 出价
             if (!Check.isNull(requestJson.getLong("bid"))) {
@@ -1579,32 +1582,32 @@ public class BatchServiceImpl implements IBatchService {
             if (!Check.isNull(requestJson.getJSONArray("deviceBrand"))) {
                 targetJson.put("device_brand", requestJson.getJSONArray("deviceBrand"));
             }
-            if (sceneId != 5) {
-                //设备价格
-                if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
-                    targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
-                }
-                //商业兴趣类型
-                if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
-                    targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
-                }
-                // 商业兴趣
-                if (!Check.isNull(requestJson.getJSONArray("businessInterest"))) {
-                    targetJson.put("business_interest", requestJson.getJSONArray("businessInterest"));
-                }
-                //网红粉丝
-                if (!Check.isNull(requestJson.getJSONArray("fansStar"))) {
-                    targetJson.put("fans_star", requestJson.getJSONArray("fansStar"));
-                }
-                //兴趣视频用户
-                if (!Check.isNull(requestJson.getJSONArray("interestVideo"))) {
-                    targetJson.put("interest_video", requestJson.getJSONArray("interestVideo"));
-                }
-                // APP行为-按分类
-                if (!Check.isNull(requestJson.getJSONArray("appInterest"))) {
-                    targetJson.put("app_interest", requestJson.getJSONArray("appInterest"));
-                }
+
+            //设备价格
+            if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
+                targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
+            }
+            //商业兴趣类型
+            if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
+                targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
+            }
+            // 商业兴趣
+            if (!Check.isNull(requestJson.getJSONArray("businessInterest"))) {
+                targetJson.put("business_interest", requestJson.getJSONArray("businessInterest"));
+            }
+            //网红粉丝
+            if (!Check.isNull(requestJson.getJSONArray("fansStar"))) {
+                targetJson.put("fans_star", requestJson.getJSONArray("fansStar"));
             }
+            //兴趣视频用户
+            if (!Check.isNull(requestJson.getJSONArray("interestVideo"))) {
+                targetJson.put("interest_video", requestJson.getJSONArray("interestVideo"));
+            }
+            // APP行为-按分类
+            if (!Check.isNull(requestJson.getJSONArray("appInterest"))) {
+                targetJson.put("app_interest", requestJson.getJSONArray("appInterest"));
+            }
+
             // APP行为-按APP名称
             if (!Check.isNull(requestJson.getJSONArray("appIds"))) {
                 targetJson.put("app_ids", requestJson.getJSONArray("appIds"));
@@ -1618,29 +1621,29 @@ public class BatchServiceImpl implements IBatchService {
                 targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
             }
 
-            if (sceneId != 5) {
-                JSONObject intelliExtendJson = new JSONObject();
 
-                // 开启智能扩量
-                if (!Check.isNull(requestJson.getInteger("isOpen"))) {
-                    intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
-                }
-                //不可突破年龄
-                if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
-                    intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
-                }
-                //不可突破性别
-                if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
-                    intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
-                }
-                // 不可突破地域
-                if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
-                    intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
-                }
-                if (!Check.isNull(intelliExtendJson)) {
-                    targetJson.put("intelli_extend", intelliExtendJson);
-                }
+            JSONObject intelliExtendJson = new JSONObject();
+
+            // 开启智能扩量
+            if (!Check.isNull(requestJson.getInteger("isOpen"))) {
+                intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
+            }
+            //不可突破年龄
+            if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
+                intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
+            }
+            //不可突破性别
+            if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
+                intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
             }
+            // 不可突破地域
+            if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
+                intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
+            }
+            if (!Check.isNull(intelliExtendJson)) {
+                targetJson.put("intelli_extend", intelliExtendJson);
+            }
+
 
             unitJson.put("target", targetJson);