diff --git a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java index 8a3db06d..bc4e5293 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java @@ -49,9 +49,6 @@ public class CmsContentController { @Resource private BsMsgService bsMsgService; - @Autowired - private RedisUtil redisUtil; - @Autowired private UserCenter userCenter; @@ -142,7 +139,15 @@ public class CmsContentController { } object.put("childDate" , list); } - objectList.add(object); + + if (cmsCategory.getType() == 3 || cmsCategory.getType() == 6 || cmsCategory.getType() == 9) { + if (object.getJSONArray("childDate").size() >0) { + objectList.add(object); + } + } else { + objectList.add(object); + } + } return ResponseMsgUtil.success(objectList); diff --git a/hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java index 04cebf46..904463c6 100644 --- a/hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java @@ -60,7 +60,7 @@ public class BsDistributionUserRelServiceImpl implements BsDistributionUserRelSe BsDistributionUserRel popularizeUser = findDistributionUserRel(map); if (pUser != null) { - if (pUser.getIsAgent() != null) { + if (pUser.getIsAgent()) { distributionUserRel.setAgentId(pUser.getId()); distributionUserRel.setAgentName(pUser.getName()); } else { diff --git a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java index 12f54cdc..eaabdb3c 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java @@ -121,6 +121,7 @@ public class HighUserServiceImpl implements HighUserService { } SecRegion region = commonService.getRegionsByName(loginLog.getProvinceName()); +// distributionUserRelService.insertDistributionRebate(user.getId(), popularizeUserId, "500000"); if (region != null) { // 绑定推广关联关系 distributionUserRelService.insertDistributionRebate(user.getId(), popularizeUserId, region.getRegionId().toString());