Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

1 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

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

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.HomeModule;
import com.dsh.other.entity.StoreConfig;
import com.dsh.other.feignclient.communityWorldCup.WorldCupClient;
import com.dsh.other.feignclient.communityWorldCup.WorldCupStoreClient;
import com.dsh.other.feignclient.communityWorldCup.model.WorldCup;
import com.dsh.other.feignclient.communityWorldCup.model.WorldCupStore;
import com.dsh.other.model.StoreConfigVo;
import com.dsh.other.service.IHomeModuleService;
@@ -42,6 +44,9 @@
    @Resource
    private WorldCupStoreClient worldCupStoreClient;

    @Resource
    private WorldCupClient worldCupClient;




@@ -60,15 +65,16 @@
        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());
                listVo.add(vo);
            }
            for (StoreConfig storeConfig : list) {
@@ -118,12 +124,14 @@

            List<WorldCupStore> worldCupStoreList = worldCupStoreClient.getWorldCupStoreList(storeId);
            for (WorldCupStore worldCupStore : worldCupStoreList) {
                WorldCup worldCup = worldCupClient.getWorldCup(worldCupStore.getWorldCupId());
                StoreConfigVo storeConfigVo = new StoreConfigVo();
                storeConfigVo.setIsTop(0);
                storeConfigVo.setId(worldCupStore.getWorldCupId());
                storeConfigVo.setBackgroundImage(ToolUtil.isNotEmpty(worldCupStore.getBackgroundImage()) ? worldCupStore.getBackgroundImage() : "https://we-park-life.oss-cn-beijing.aliyuncs.com/img/760934115ff6468591ed51f0d760a989.jpg");
                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);
            }