|
@@ -174,7 +174,7 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(scene_id)) {
|
|
|
unitJson.put("scene_id", scene_id);
|
|
|
}
|
|
|
-
|
|
|
+ Integer sceneId = Integer.valueOf(scene_id.get(0).toString());
|
|
|
// 资源创作方式
|
|
|
if (!Check.isNull(requestJson.getInteger("unitType"))) {
|
|
|
unitJson.put("unit_type", requestJson.getInteger("unitType"));
|
|
@@ -282,25 +282,28 @@ 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 (!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"));
|
|
|
+
|
|
|
+ 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"))) {
|
|
@@ -319,26 +322,28 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
|
|
|
}
|
|
|
|
|
|
- JSONObject intelliExtendJson = new JSONObject();
|
|
|
+ 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);
|
|
|
+ // 开启智能扩量
|
|
|
+ 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);
|
|
@@ -746,6 +751,8 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(scene_id)) {
|
|
|
unitJson.put("scene_id", scene_id);
|
|
|
}
|
|
|
+
|
|
|
+ Integer sceneId = Integer.valueOf(scene_id.get(0).toString());
|
|
|
// 资源创作方式
|
|
|
if (!Check.isNull(group.getUnitType())) {
|
|
|
if (!Check.isNull(group.getUnitType())) {
|
|
@@ -754,7 +761,6 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
|
|
|
//投放开始时间
|
|
|
if (!Check.isNull(group.getBeginTime())) {
|
|
|
-
|
|
|
String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
boolean beginTimeBoolean = DateUtils.compare(group.getBeginTime(), nowDate);
|
|
|
if (beginTimeBoolean) {
|
|
@@ -869,29 +875,32 @@ 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 (!Check.isNull(groupTarget.getBusinessInterestType())) {
|
|
|
- targetJson.put("business_interest_type", groupTarget.getBusinessInterestType());
|
|
|
- }
|
|
|
- // 商业兴趣
|
|
|
- if (!Check.isNull(groupTarget.getBusinessInterest())) {
|
|
|
- targetJson.put("business_interest", JSONArray.parseArray(groupTarget.getBusinessInterest()));
|
|
|
- }
|
|
|
- //网红粉丝
|
|
|
- if (!Check.isNull(groupTarget.getFansStar())) {
|
|
|
- targetJson.put("fans_star", JSONArray.parseArray(groupTarget.getFansStar()));
|
|
|
- }
|
|
|
- //兴趣视频用户
|
|
|
- if (!Check.isNull(groupTarget.getInterestVideo())) {
|
|
|
- targetJson.put("interest_video", JSONArray.parseArray(groupTarget.getInterestVideo()));
|
|
|
- }
|
|
|
- // APP行为-按分类
|
|
|
- if (!Check.isNull(groupTarget.getAppInterest())) {
|
|
|
- targetJson.put("app_interest", JSONArray.parseArray(groupTarget.getAppInterest()));
|
|
|
+ if (sceneId != 5) {
|
|
|
+
|
|
|
+ //设备价格
|
|
|
+ if (!Check.isNull(groupTarget.getDevicePrice())) {
|
|
|
+ targetJson.put("device_price", JSONArray.parseArray(groupTarget.getDevicePrice()));
|
|
|
+ }
|
|
|
+ //商业兴趣类型
|
|
|
+ if (!Check.isNull(groupTarget.getBusinessInterestType())) {
|
|
|
+ targetJson.put("business_interest_type", groupTarget.getBusinessInterestType());
|
|
|
+ }
|
|
|
+ // 商业兴趣
|
|
|
+ if (!Check.isNull(groupTarget.getBusinessInterest())) {
|
|
|
+ targetJson.put("business_interest", JSONArray.parseArray(groupTarget.getBusinessInterest()));
|
|
|
+ }
|
|
|
+ //网红粉丝
|
|
|
+ if (!Check.isNull(groupTarget.getFansStar())) {
|
|
|
+ targetJson.put("fans_star", JSONArray.parseArray(groupTarget.getFansStar()));
|
|
|
+ }
|
|
|
+ //兴趣视频用户
|
|
|
+ if (!Check.isNull(groupTarget.getInterestVideo())) {
|
|
|
+ targetJson.put("interest_video", JSONArray.parseArray(groupTarget.getInterestVideo()));
|
|
|
+ }
|
|
|
+ // APP行为-按分类
|
|
|
+ if (!Check.isNull(groupTarget.getAppInterest())) {
|
|
|
+ targetJson.put("app_interest", JSONArray.parseArray(groupTarget.getAppInterest()));
|
|
|
+ }
|
|
|
}
|
|
|
// APP行为-按APP名称
|
|
|
if (!Check.isNull(groupTarget.getAppIds())) {
|
|
@@ -906,26 +915,30 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
targetJson.put("exclude_population", JSONArray.parseArray(groupTarget.getExcludePopulation()));
|
|
|
}
|
|
|
|
|
|
- JSONObject intelliExtendJson = new JSONObject();
|
|
|
+ if (sceneId != 5) {
|
|
|
|
|
|
- // 开启智能扩量
|
|
|
- if (!Check.isNull(groupTarget.getIsOpen())) {
|
|
|
- intelliExtendJson.put("is_open", groupTarget.getIsOpen());
|
|
|
- }
|
|
|
- //不可突破年龄
|
|
|
- if (!Check.isNull(groupTarget.getNoAgeBreak())) {
|
|
|
- intelliExtendJson.put("no_age_break", groupTarget.getNoAgeBreak());
|
|
|
- }
|
|
|
- //不可突破性别
|
|
|
- if (!Check.isNull(groupTarget.getNoGenderBreak())) {
|
|
|
- intelliExtendJson.put("no_gender_break", groupTarget.getNoGenderBreak());
|
|
|
- }
|
|
|
- // 不可突破地域
|
|
|
- if (!Check.isNull(groupTarget.getNoAreaBreak())) {
|
|
|
- intelliExtendJson.put("no_area_break", groupTarget.getNoAreaBreak());
|
|
|
- }
|
|
|
- if (!Check.isNull(intelliExtendJson)) {
|
|
|
- targetJson.put("intelli_extend", intelliExtendJson);
|
|
|
+
|
|
|
+ JSONObject intelliExtendJson = new JSONObject();
|
|
|
+
|
|
|
+ // 开启智能扩量
|
|
|
+ if (!Check.isNull(groupTarget.getIsOpen())) {
|
|
|
+ intelliExtendJson.put("is_open", groupTarget.getIsOpen());
|
|
|
+ }
|
|
|
+ //不可突破年龄
|
|
|
+ if (!Check.isNull(groupTarget.getNoAgeBreak())) {
|
|
|
+ intelliExtendJson.put("no_age_break", groupTarget.getNoAgeBreak());
|
|
|
+ }
|
|
|
+ //不可突破性别
|
|
|
+ if (!Check.isNull(groupTarget.getNoGenderBreak())) {
|
|
|
+ intelliExtendJson.put("no_gender_break", groupTarget.getNoGenderBreak());
|
|
|
+ }
|
|
|
+ // 不可突破地域
|
|
|
+ if (!Check.isNull(groupTarget.getNoAreaBreak())) {
|
|
|
+ intelliExtendJson.put("no_area_break", groupTarget.getNoAreaBreak());
|
|
|
+ }
|
|
|
+ if (!Check.isNull(intelliExtendJson)) {
|
|
|
+ targetJson.put("intelli_extend", intelliExtendJson);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
unitJson.put("target", targetJson);
|
|
@@ -1695,6 +1708,7 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
|
|
|
String result = HttpUtils.httpPostRequest(url, param, headers);
|
|
|
JSONObject resultJson = JSONObject.parseObject(result);
|
|
|
+ log.info("获取联盟白名单,accountId:{},data:{}", accountId, resultJson);
|
|
|
if (!Check.isNull(resultJson)) {
|
|
|
Integer code = resultJson.getInteger("code");
|
|
|
if (code == 0) {
|