|
@@ -590,13 +590,12 @@ 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("businessInterestType"))) {
|
|
|
targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
|
|
@@ -886,12 +885,13 @@ 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.getBusinessInterestType())) {
|
|
|
targetJson.put("business_interest_type", groupTarget.getBusinessInterestType());
|
|
@@ -1745,13 +1745,31 @@ 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("businessInterestType"))) {
|
|
|
targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
|
|
@@ -1770,21 +1788,9 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
}
|
|
|
}
|
|
|
// 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();
|