|
@@ -295,13 +295,13 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
|
|
if (!Check.isNull(requestJson.getJSONArray("interestLabel"))) {
|
|
if (!Check.isNull(requestJson.getJSONArray("interestLabel"))) {
|
|
interest.put("label", requestJson.getJSONArray("interestLabel"));
|
|
interest.put("label", requestJson.getJSONArray("interestLabel"));
|
|
}
|
|
}
|
|
- if (!Check.isNull(behavior)) {
|
|
|
|
|
|
+ if (!behavior.isEmpty()) {
|
|
behaviorInterest.put("behavior", behavior);
|
|
behaviorInterest.put("behavior", behavior);
|
|
}
|
|
}
|
|
- if (!Check.isNull(interest)) {
|
|
|
|
|
|
+ if (!interest.isEmpty()) {
|
|
behaviorInterest.put("interest", interest);
|
|
behaviorInterest.put("interest", interest);
|
|
}
|
|
}
|
|
- if (!Check.isNull(behaviorInterest)) {
|
|
|
|
|
|
+ if (!behaviorInterest.isEmpty()) {
|
|
targetJson.put("behavior_interest", behaviorInterest);
|
|
targetJson.put("behavior_interest", behaviorInterest);
|
|
}
|
|
}
|
|
if (!Check.isNull(targetJson)) {
|
|
if (!Check.isNull(targetJson)) {
|
|
@@ -317,8 +317,8 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
|
|
Integer code = resultJson.getInteger("code");
|
|
Integer code = resultJson.getInteger("code");
|
|
if (code == 0) {
|
|
if (code == 0) {
|
|
kuaishouTemplateService.getTemplateByAccountId(accountId, oauthToken.getAccessToken(), 1);
|
|
kuaishouTemplateService.getTemplateByAccountId(accountId, oauthToken.getAccessToken(), 1);
|
|
- }else{
|
|
|
|
- log.error("修改账户定向失败,"+resultJson.getString("message"));
|
|
|
|
|
|
+ } else {
|
|
|
|
+ log.error("修改账户定向失败," + resultJson.getString("message"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -338,14 +338,14 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> getRelatedAccountGroup(String id, Integer type,Long accountId, Integer pageNo, Integer pageSize) {
|
|
|
|
|
|
+ public Result<Object> getRelatedAccountGroup(String id, Integer type, Long accountId, Integer pageNo, Integer pageSize) {
|
|
PageInfo pageInfo = null;
|
|
PageInfo pageInfo = null;
|
|
if (1 == type) {
|
|
if (1 == type) {
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
pageInfo = new PageInfo(packageMapper.getRelatedAccount(id));
|
|
pageInfo = new PageInfo(packageMapper.getRelatedAccount(id));
|
|
} else {
|
|
} else {
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
- pageInfo = new PageInfo(packageMapper.getRelatedGroup(id,accountId));
|
|
|
|
|
|
+ pageInfo = new PageInfo(packageMapper.getRelatedGroup(id, accountId));
|
|
}
|
|
}
|
|
return Result.ok(pageInfo);
|
|
return Result.ok(pageInfo);
|
|
}
|
|
}
|
|
@@ -493,13 +493,13 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
|
|
if (!Check.isNull(data.getJSONArray("interestLabel"))) {
|
|
if (!Check.isNull(data.getJSONArray("interestLabel"))) {
|
|
interest.put("label", data.getJSONArray("interestLabel"));
|
|
interest.put("label", data.getJSONArray("interestLabel"));
|
|
}
|
|
}
|
|
- if (!Check.isNull(behavior)) {
|
|
|
|
|
|
+ if (!behavior.isEmpty()) {
|
|
behaviorInterest.put("behavior", behavior);
|
|
behaviorInterest.put("behavior", behavior);
|
|
}
|
|
}
|
|
- if (!Check.isNull(interest)) {
|
|
|
|
|
|
+ if (!interest.isEmpty()) {
|
|
behaviorInterest.put("interest", interest);
|
|
behaviorInterest.put("interest", interest);
|
|
}
|
|
}
|
|
- if (!Check.isNull(behaviorInterest)) {
|
|
|
|
|
|
+ if (!behaviorInterest.isEmpty()) {
|
|
targetJson.put("behavior_interest", behaviorInterest);
|
|
targetJson.put("behavior_interest", behaviorInterest);
|
|
}
|
|
}
|
|
if (!Check.isNull(targetJson)) {
|
|
if (!Check.isNull(targetJson)) {
|
|
@@ -535,8 +535,8 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> queryPushResults(String id, JSONArray accountIds,String status) {
|
|
|
|
- List<JSONObject> list = relMapper.queryPushResults(id, accountIds,status);
|
|
|
|
|
|
+ public Result<Object> queryPushResults(String id, JSONArray accountIds, String status) {
|
|
|
|
+ List<JSONObject> list = relMapper.queryPushResults(id, accountIds, status);
|
|
return Result.ok(new PageInfo<>(list));
|
|
return Result.ok(new PageInfo<>(list));
|
|
}
|
|
}
|
|
|
|
|