Merge branch 'master' into 2.0-dev

* master:
  修改配置星巴克 肯德基 会员充值 话费 微信商户号
  修改配置星巴克 肯德基 会员充值 话费 微信商户号

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
#	hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java

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,9 +139,17 @@ public class CmsContentController {
                         }
                         object.put("childDate" , list);
                     }
+
+                    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);
             } else {
                 JSONObject object = new JSONObject();

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 {

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());