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

!82 修复查询积分商品参数问题

Browse Source 
Merge pull request !82 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-12-15 09:59:54 +00:00 committed by Gitee
commit 6253590326
6 changed files with 10 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java
View File

@ -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<IPage<PointsGoodsVO>> getPointsGoodsPage(PointsGoodsSearchParams searchParams, PageVO page) {
return ResultUtil.data(pointsGoodsService.pageFindAllVO(searchParams, page));
public ResultMessage<IPage<PointsGoods>> getPointsGoodsPage(PointsGoodsSearchParams searchParams, PageVO page) {
IPage<PointsGoods> pointsGoodsByPage = pointsGoodsService.pageFindAll(searchParams, page);
return ResultUtil.data(pointsGoodsByPage);
}
@GetMapping("/category")

16
framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java
View File

@ -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 <T> QueryWrapper<T> queryWrapper() {
QueryWrapper<T> 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;
}

16
framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java
View File

@ -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<PointsGoods> {
/**
* 积分商品分页
*
* @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<PointsGoodsVO> getPointsGoodsVO(IPage<PointsGoodsVO> page, @Param(Constants.WRAPPER) Wrapper<PointsGoodsVO> queryWrapper);
}

11
framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java
View File

@ -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<PointsGood
*/
PointsGoodsVO getPointsGoodsDetailBySkuId(String skuId);
/**
* 获取积分商品vo
*
* @param searchParams 查询参数
* @param pageVO 分页参数
* @return 积分商品vo
*/
IPage<PointsGoodsVO> pageFindAllVO(PointsGoodsSearchParams searchParams, PageVO pageVO);
}

4
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
View File

@ -309,10 +309,8 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
//未付款订单自动取消
if (unpaidOrders != null && !unpaidOrders.isEmpty()) {
for (Order unpaidOrder : unpaidOrders) {
unpaidOrder.setOrderStatus(OrderStatusEnum.CANCELLED.name());
unpaidOrder.setCancelReason("拼团活动结束订单未付款，系统自动取消订单");
orderService.systemCancel(unpaidOrder.getSn(), "拼团活动结束订单未付款，系统自动取消订单");
}
orderService.updateBatchById(unpaidOrders);
}
List<Order> paidOrders = listMap.get(PayStatusEnum.PAID.name());
//如待参团人数大于0，并已开启虚拟成团

16
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
View File

@ -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<Points
return pointsGoodsVO;
}
/**
* 获取积分商品vo
*
* @param searchParams 查询参数
* @param pageVO 分页参数
* @return 积分商品vo
*/
@Override
public IPage<PointsGoodsVO> pageFindAllVO(PointsGoodsSearchParams searchParams, PageVO pageVO) {
return this.baseMapper.getPointsGoodsVO(PageUtil.initPage(pageVO), searchParams.queryWrapper());
}
/**
* 检查促销参数
*