From 09e1ee4dbca601299e8e89e18eab54aaba131819 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 1 Feb 2023 17:29:43 +0800
Subject: [PATCH] Merge branch 'master' into 2.0-dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
#	hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
---
 .../com/cweb/controller/CmsContentController.java   | 13 +++++++++----
 .../impl/BsDistributionUserRelServiceImpl.java      |  2 +-
 .../com/hai/service/impl/HighUserServiceImpl.java   |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

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