无关风月
21 小时以前 d2b9ce5ceb7059dfa06e9281661c8c9516686dd0
cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
@@ -65,9 +65,9 @@
        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());
@@ -75,6 +75,7 @@
                vo.setSort(homeModule.getSort());
                vo.setBackgroundImage(homeModule.getBackgroundImage());
                vo.setDisplayType(homeModule.getDisplayType());
                vo.setId(homeModule.getId());
                listVo.add(vo);
            }
            for (StoreConfig storeConfig : list) {
@@ -115,10 +116,8 @@
                            storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
                            break;
                        }
                    }
                }
                listVo.add(storeConfigVo);
            }
@@ -135,8 +134,6 @@
                storeConfigVo.setSort(worldCupStore.getSort());
                listVo.add(storeConfigVo);
            }
            //排序
            Collections.sort(listVo, new Comparator<StoreConfigVo>() {
                @Override