From 6c22bf24a6796a2e876585f6b13510b136732b44 Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 6 Aug 2021 17:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E5=B1=82=E4=BF=9D=E5=AD=98=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E6=BC=94=E7=A4=BA=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E5=88=99=E4=B8=8D=E8=83=BD=E5=BC=80=E5=90=AF=E6=A5=BC?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/serviceimpl/PageDataServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index 2595e44e..a06d030f 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -1,11 +1,11 @@ package cn.lili.modules.page.serviceimpl; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; -import cn.lili.mybatis.util.PageUtil; +import cn.lili.common.properties.SystemSettingProperties; import cn.lili.common.vo.PageVO; -import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.dos.PageData; import cn.lili.modules.page.entity.dto.PageDataDTO; import cn.lili.modules.page.entity.enums.PageEnum; @@ -13,11 +13,13 @@ import cn.lili.modules.page.entity.vos.PageDataListVO; import cn.lili.modules.page.entity.vos.PageDataVO; import cn.lili.modules.page.mapper.PageDataMapper; import cn.lili.modules.page.service.PageDataService; +import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -29,6 +31,10 @@ import org.springframework.stereotype.Service; @Service public class PageDataServiceImpl extends ServiceImpl implements PageDataService { + + @Autowired + private SystemSettingProperties systemSettingProperties; + @Override public void addStorePageData(String storeId) { //设置店铺的PC页面 @@ -51,12 +57,15 @@ public class PageDataServiceImpl extends ServiceImpl i @Override public PageData addPageData(PageData pageData) { //如果页面为发布,则关闭其他页面,开启此页面 - if (pageData.getPageShow().equals(SwitchEnum.OPEN.name())) { + //演示站点不可以开启楼层 + if (!systemSettingProperties.getIsDemoSite() && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) { LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType()); lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType()); lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name()); this.update(lambdaUpdateWrapper); + } else { + pageData.setPageShow(SwitchEnum.CLOSE.name()); } this.save(pageData); return pageData;