Merge branch 'developer' into 'master'

观云台小程序

See merge request !17

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java

@@ -47,7 +47,6 @@ public class BaseSalesController {
         BaseSalesVo vo = new BaseSalesVo();
         List<Integer> list = this.storeSearchUtils.storeSearch(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
         List<String> onLine = this.storeSearchUtils.onLineStoreSearch(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
-        List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(qo.getParentId());
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(qo.getUserId(), qo.getEnterpriseId());
         Integer maxLevel = 0;
         /******线下渠道需要点击下钻，该值只会在线下时才会使用********/
@@ -61,6 +60,7 @@ public class BaseSalesController {
                 qo.setLevel(7);
             }
         }
+        List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(qo.getEnterpriseId(), qo.getParentId(), qo.getLevel());
         /****首页进入基础页面时，如果渠道为空，根据当前条件判断渠道，channel==null表示多渠道***/
         if(qo.getChannel() == null){
             /**********设置层级名称，只有在首次进入页面会展示，下钻均显示返回上一级*********/

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/GoDownComponent.java

@@ -69,7 +69,6 @@ public class GoDownComponent {
     public LevelVo setValue(CommonQO params, BaseSalesVo vo){
         params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
-        params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         /******线下渠道需要点击下钻，该值只会在线下时才会使用********/
         LevelVo levelVo = this.storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
@@ -81,6 +80,7 @@ public class GoDownComponent {
                 params.setLevel(7);
             }
         }
+        params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getEnterpriseId(), params.getParentId(), params.getLevel()));
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
         if(params.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && params.getLevel() == levelVo.getLevel()){
             vo.setChangeLevel(1);

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -226,11 +226,21 @@ public class StoreSearchUtils {
         return null;
     }
 
-    public List<Integer> getChildrenStoreGroupIdList(Integer storeGroupId){
-        if(storeGroupId != null){
-            List<StoreGroupDTO> result = this.storeGroupApiService.listStoreGroupAndChildren(storeGroupId).getResult();
-            if(CollectionUtils.isNotEmpty(result)){
-                return result.stream().map(storeGroupDTO -> storeGroupDTO.getStoreGroupId()).collect(Collectors.toList());
+    public List<Integer> getChildrenStoreGroupIdList(Integer enterpriseId, Integer storeGroupId, Integer level){
+        if(level < 7){
+            if(storeGroupId != null){
+                List<StoreGroupDTO> result = this.storeGroupApiService.listStoreGroupAndChildren(storeGroupId).getResult();
+                if(CollectionUtils.isNotEmpty(result)){
+                    return result.stream().map(storeGroupDTO -> storeGroupDTO.getStoreGroupId()).collect(Collectors.toList());
+                }
+            }
+        }else {
+            StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+            storeSearchDTO.setEnterpriseId(enterpriseId);
+            storeSearchDTO.setStoreGroupId(storeGroupId);
+            ServiceResponse<Page<StoreDTO>> response = this.storeApiService.listStore(storeSearchDTO, 1, 10000);
+            if(response.isSuccess() && response.getResult() != null){
+                return response.getResult().getResult().stream().map(storeDTO -> storeDTO.getStoreInfoId()).collect(Collectors.toList());
             }
         }
         return new ArrayList<>();