bug修改

无关风月

23 小时以前 d2b9ce5ceb7059dfa06e9281661c8c9516686dd0

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java

@@ -65,15 +65,17 @@
        try {
            List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId)
                    .orderByAsc("sort").eq("isOpen", 1));
            HomeModule homeModule = homeModuleService.getOne(new QueryWrapper<HomeModule>().eq("isOpen", 1));
            List<HomeModule> homeModules = homeModuleService.list(new QueryWrapper<HomeModule>().eq("isOpen", 1).eq("storeId",storeId));
            List<StoreConfigVo> listVo = new ArrayList<>();
            if(null != homeModule){
            for (HomeModule homeModule : homeModules) {
                StoreConfigVo vo = new StoreConfigVo();
                vo.setType(0);
                vo.setIsOpen(homeModule.getIsOpen());
                vo.setIsTop(homeModule.getIsTop());
                vo.setSort(homeModule.getSort());
                vo.setBackgroundImage(homeModule.getBackgroundImage());
                vo.setDisplayType(homeModule.getDisplayType());
                vo.setId(homeModule.getId());
                listVo.add(vo);
            }
            for (StoreConfig storeConfig : list) {
@@ -114,10 +116,8 @@
                            storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
                            break;
                        }

                    }
                }

                listVo.add(storeConfigVo);
            }

@@ -130,11 +130,10 @@
                storeConfigVo.setBackgroundImage(ToolUtil.isNotEmpty(worldCupStore.getBackgroundImage()) ? worldCupStore.getBackgroundImage() : worldCup.getHomeBackdropImg());
                storeConfigVo.setType(9);
                storeConfigVo.setIsOpen(worldCupStore.getIsOpen());
                storeConfigVo.setDisplayType(worldCupStore.getDisplayType());
                storeConfigVo.setSort(worldCupStore.getSort());
                listVo.add(storeConfigVo);
            }


            //排序
            Collections.sort(listVo, new Comparator<StoreConfigVo>() {
                @Override