|
@@ -285,11 +285,15 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(requestJson.getJSONArray("deviceBrand"))) {
|
|
|
targetJson.put("device_brand", requestJson.getJSONArray("deviceBrand"));
|
|
|
}
|
|
|
+ //设备价格
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
|
|
|
+ targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
|
|
|
+ }
|
|
|
|
|
|
if (sceneId != 5) {
|
|
|
- //设备价格
|
|
|
- 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 (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
|
|
@@ -590,12 +594,14 @@ 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.getJSONArray("devicePrice"))) {
|
|
|
+ targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
|
|
|
+ }
|
|
|
+ if (sceneId != 5) {
|
|
|
+ if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
|
|
|
+ targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));
|
|
|
}
|
|
|
//商业兴趣类型
|
|
|
if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
|
|
@@ -886,12 +892,15 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(groupTarget.getDeviceBrand())) {
|
|
|
targetJson.put("device_brand", JSONArray.parseArray(groupTarget.getDeviceBrand()));
|
|
|
}
|
|
|
+ //设备价格
|
|
|
+ if (!Check.isNull(groupTarget.getDevicePrice())) {
|
|
|
+ targetJson.put("device_price", JSONArray.parseArray(groupTarget.getDevicePrice()));
|
|
|
+ }
|
|
|
if (sceneId != 5) {
|
|
|
-
|
|
|
- //设备价格
|
|
|
- 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 (!Check.isNull(groupTarget.getBusinessInterestType())) {
|
|
|
targetJson.put("business_interest_type", groupTarget.getBusinessInterestType());
|
|
@@ -1596,25 +1605,18 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (Check.isNull(unitId)) {
|
|
|
throw new Exception("请选择广告组");
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
unitJson.put("unit_id", unitId);
|
|
|
-
|
|
|
-
|
|
|
queryWrapper.eq("unit_id", unitId);
|
|
|
queryWrapper.last("limit 1");
|
|
|
KuaiShouGroup kuaiShouGroup = groupMapper.selectOne(queryWrapper);
|
|
|
if (Check.isNull(kuaiShouGroup)) {
|
|
|
throw new Exception("未获取到组信息");
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
String sceneId = kuaiShouGroup.getSceneId();
|
|
|
if (Check.isNull(sceneId)) {
|
|
|
throw new Exception("未获取资源位置");
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// JSONObject jsonObject = JSONArr(sceneId);
|
|
|
Integer scene = (Integer) JSONArray.parseArray(sceneId).get(0);
|
|
|
|
|
@@ -1745,13 +1747,35 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(requestJson.getInteger("network"))) {
|
|
|
targetJson.put("network", requestJson.getInteger("network"));
|
|
|
}
|
|
|
+ // 设备品牌
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("deviceBrand"))) {
|
|
|
+ targetJson.put("device_brand", requestJson.getJSONArray("deviceBrand"));
|
|
|
+ }
|
|
|
+ // 设备价格
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
|
|
|
+ targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
|
|
|
+ }
|
|
|
|
|
|
+ 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"));
|
|
|
+ }
|
|
|
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("population"))) {
|
|
|
+ targetJson.put("population", requestJson.getJSONArray("population"));
|
|
|
+ }
|
|
|
+ // 人群包排除
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("excludePopulation"))) {
|
|
|
+ targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
|
|
|
+ }
|
|
|
if (scene != 5) {
|
|
|
- //设备价格
|
|
|
- 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 (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
|
|
|
targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
|
|
@@ -1769,22 +1793,6 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
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"));
|
|
|
- }
|
|
|
- // 人群包定向
|
|
|
- if (!Check.isNull(requestJson.getJSONArray("population"))) {
|
|
|
- targetJson.put("population", requestJson.getJSONArray("population"));
|
|
|
- }
|
|
|
- // 人群包排除
|
|
|
- if (!Check.isNull(requestJson.getJSONArray("excludePopulation"))) {
|
|
|
- targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
|
|
|
- }
|
|
|
|
|
|
if (scene != 5) {
|
|
|
JSONObject intelliExtendJson = new JSONObject();
|