From f0b43ddd32ad32d8c4e099eaf8e97672f27c7eae Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 15 Dec 2021 17:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E5=95=86=E5=93=81=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/PointsGoodsBuyerController.java | 6 ++++-- .../entity/vos/PointsGoodsSearchParams.java | 16 +++++----------- .../promotion/mapper/PointsGoodsMapper.java | 16 ---------------- .../promotion/service/PointsGoodsService.java | 11 ----------- .../serviceimpl/PintuanServiceImpl.java | 4 +--- .../serviceimpl/PointsGoodsServiceImpl.java | 16 ---------------- 6 files changed, 10 insertions(+), 59 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java index 14dcf070..e4cd94d1 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java @@ -3,6 +3,7 @@ package cn.lili.controller.promotion; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.promotion.entity.dos.PointsGoods; import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory; import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams; import cn.lili.modules.promotion.entity.vos.PointsGoodsVO; @@ -35,8 +36,9 @@ public class PointsGoodsBuyerController { @GetMapping @ApiOperation(value = "分页获取积分商品") - public ResultMessage> getPointsGoodsPage(PointsGoodsSearchParams searchParams, PageVO page) { - return ResultUtil.data(pointsGoodsService.pageFindAllVO(searchParams, page)); + public ResultMessage> getPointsGoodsPage(PointsGoodsSearchParams searchParams, PageVO page) { + IPage pointsGoodsByPage = pointsGoodsService.pageFindAll(searchParams, page); + return ResultUtil.data(pointsGoodsByPage); } @GetMapping("/category") diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java index baf06ef6..11a7df3a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java @@ -25,9 +25,6 @@ public class PointsGoodsSearchParams extends BasePromotionsSearchParams { @ApiModelProperty(value = "积分商品分类编号") private String pointsGoodsCategoryId; - @ApiModelProperty(value = "是否为推荐商品") - private Boolean recommend; - @ApiModelProperty(value = "积分,可以为范围，如10_1000") private String points; @@ -36,25 +33,22 @@ public class PointsGoodsSearchParams extends BasePromotionsSearchParams { public QueryWrapper queryWrapper() { QueryWrapper queryWrapper = super.queryWrapper(); if (CharSequenceUtil.isNotEmpty(goodsName)) { - queryWrapper.eq("gs.goods_name", goodsName); + queryWrapper.like("goods_name", goodsName); } if (CharSequenceUtil.isNotEmpty(skuId)) { - queryWrapper.eq("pg.sku_id", skuId); + queryWrapper.eq("sku_id", skuId); } if (CharSequenceUtil.isNotEmpty(pointsGoodsCategoryId)) { - queryWrapper.eq("pg.points_goods_category_id", pointsGoodsCategoryId); + queryWrapper.eq("points_goods_category_id", pointsGoodsCategoryId); } if (CharSequenceUtil.isNotEmpty(points)) { String[] s = points.split("_"); if (s.length > 1) { - queryWrapper.between("pg.points", s[0], s[1]); + queryWrapper.between("points", s[0], s[1]); } else { - queryWrapper.eq("pg.points", s[0]); + queryWrapper.eq("points", s[0]); } } - if (recommend != null) { - queryWrapper.eq("gs.recommend", recommend); - } return queryWrapper; } diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java index 615a8672..6e81a047 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java @@ -1,13 +1,7 @@ package cn.lili.modules.promotion.mapper; import cn.lili.modules.promotion.entity.dos.PointsGoods; -import cn.lili.modules.promotion.entity.vos.PointsGoodsVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; /** * 积分商品数据处理层 @@ -17,14 +11,4 @@ import org.apache.ibatis.annotations.Select; **/ public interface PointsGoodsMapper extends BaseMapper { - /** - * 积分商品分页 - * - * @param page 分页 - * @param queryWrapper 查询条件 - * @return 积分商品分页 - */ - @Select("select * from li_points_goods pg left join li_goods_sku gs on pg.sku_id = gs.id ${ew.customSqlSegment}") - IPage getPointsGoodsVO(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - } diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java index 15acc599..948d98f8 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java @@ -1,10 +1,7 @@ package cn.lili.modules.promotion.service; -import cn.lili.common.vo.PageVO; import cn.lili.modules.promotion.entity.dos.PointsGoods; -import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams; import cn.lili.modules.promotion.entity.vos.PointsGoodsVO; -import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -40,12 +37,4 @@ public interface PointsGoodsService extends AbstractPromotionsService pageFindAllVO(PointsGoodsSearchParams searchParams, PageVO pageVO); } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java index ffe90e9e..dfbcbc78 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java @@ -309,10 +309,8 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl paidOrders = listMap.get(PayStatusEnum.PAID.name()); //如待参团人数大于0，并已开启虚拟成团 diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java index ed53f833..92a2dec9 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java @@ -5,23 +5,19 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.promotion.entity.dos.PointsGoods; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum; -import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams; import cn.lili.modules.promotion.entity.vos.PointsGoodsVO; import cn.lili.modules.promotion.mapper.PointsGoodsMapper; import cn.lili.modules.promotion.service.PointsGoodsService; import cn.lili.modules.promotion.service.PromotionGoodsService; import cn.lili.modules.promotion.tools.PromotionTools; import cn.lili.modules.search.service.EsGoodsIndexService; -import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -165,18 +161,6 @@ public class PointsGoodsServiceImpl extends AbstractPromotionsServiceImpl pageFindAllVO(PointsGoodsSearchParams searchParams, PageVO pageVO) { - return this.baseMapper.getPointsGoodsVO(PageUtil.initPage(pageVO), searchParams.queryWrapper()); - } - /** * 检查促销参数 *