caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!210 优化保存楼层装修。优化管理端优惠券搜索

Browse Source 
Merge pull request !210 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-07-13 13:05:15 +00:00 committed by Gitee
commit 1fa247aa35
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.page.serviceimpl; package cn.lili.modules.page.serviceimpl;
import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.SwitchEnum;
@ -80,8 +81,8 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
//如果页面为发布，则关闭其他页面，开启此页面 //如果页面为发布，则关闭其他页面，开启此页面
if (pageData.getPageShow() != null && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) { if (pageData.getPageShow() != null && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) {
LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate(); LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType()); lambdaUpdateWrapper.eq(CharSequenceUtil.isNotEmpty(pageData.getPageType()), PageData::getPageType, pageData.getPageType());
lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType()); lambdaUpdateWrapper.eq(CharSequenceUtil.isNotEmpty(pageData.getPageClientType()), PageData::getPageClientType, pageData.getPageClientType());
lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name()); lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name());
this.update(lambdaUpdateWrapper); this.update(lambdaUpdateWrapper);
} else { } else {

2
manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
View File

@ -44,7 +44,9 @@ public class CouponManagerController {
@ApiOperation(value = "获取优惠券列表") @ApiOperation(value = "获取优惠券列表")
@GetMapping @GetMapping
public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) { public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {
if (queryParam.getStoreId() == null) {
queryParam.setStoreId(PromotionTools.PLATFORM_ID); queryParam.setStoreId(PromotionTools.PLATFORM_ID);
}
return ResultUtil.data(couponService.pageVOFindAll(queryParam, page)); return ResultUtil.data(couponService.pageVOFindAll(queryParam, page));
} }