From bbe04ad4254f594b1b5db27bcf48ce9ec3d3aa3f Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 8 Dec 2023 15:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BuyOrderController.java | 9 +-- .../modules/book/service/BuyOrderService.java | 2 +- .../service/impl/BuyOrderServiceImpl.java | 64 ++++++++++++++++++- 3 files changed, 69 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index f265f1e6..e0cd0935 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -112,8 +112,8 @@ public class BuyOrderController { */ @RequestMapping(path = "/orderList", method = RequestMethod.POST) public R orderList(@RequestBody BuyOrderListRequestVo requestVo) { - Map result = buyOrderService.orderList(requestVo); - return R.ok().put("result", result); + Page buyOrderPage = buyOrderService.orderList(requestVo); + return R.ok().put("result", buyOrderPage); } /** @@ -376,6 +376,7 @@ public class BuyOrderController { integers.add(1); integers.add(2); integers.add(3); + wrapper.gt(BuyOrder::getOrderId,4522); wrapper.in(BuyOrder::getOrderStatus,integers); wrapper.eq(BuyOrder::getOrderType,"order"); List list = buyOrderService.list(wrapper); @@ -390,7 +391,7 @@ public class BuyOrderController { @RequestMapping("/llll1") public R ls1(){ - Integer[] is = {133,134,135}; + Integer[] is = {39,62,123,127}; List collect = buyOrderProductService.getBaseMapper().selectList(new LambdaQueryWrapper().in(BuyOrderProduct::getProductId, is)).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -401,7 +402,7 @@ public class BuyOrderController { List list = buyOrderService.list(wrapper); for (BuyOrder b : list){ MyUserEntity byId = myUserService.getById(b.getUserId()); - byId.setTgdzPower(1); + byId.setWylqPower(1); myUserService.updateById(byId); } diff --git a/src/main/java/com/peanut/modules/book/service/BuyOrderService.java b/src/main/java/com/peanut/modules/book/service/BuyOrderService.java index ec283854..4516ca63 100644 --- a/src/main/java/com/peanut/modules/book/service/BuyOrderService.java +++ b/src/main/java/com/peanut/modules/book/service/BuyOrderService.java @@ -43,7 +43,7 @@ public interface BuyOrderService extends IService { * @param requestVo * @return */ - Map orderList(BuyOrderListRequestVo requestVo); + Page orderList(BuyOrderListRequestVo requestVo); /** * 订单拆分发货 diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index d709998b..357d3b19 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.DateUtils; import com.peanut.common.utils.ExcludeEmptyQueryWrapper; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.Query; @@ -356,7 +358,67 @@ public class BuyOrderServiceImpl extends ServiceImpl impl } @Override - public Map orderList(BuyOrderListRequestVo requestVo) { + public Page orderList(BuyOrderListRequestVo requestVo) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(BuyOrder.class); + wrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,BuyOrder::getUserId); + wrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()),BuyOrder::getOrderStatus,requestVo.getOrderStatus()); + wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime()); + wrapper.lt(requestVo.getEndTime()!=null,BuyOrder::getCreateTime,requestVo.getEndTime()); + wrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like(BuyOrder::getOrderSn,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getTel,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getName,requestVo.getSearchKeyWord())); + if(StringUtils.isNotBlank(requestVo.getProductName())){ + MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); + buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class); + buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); + buyOrderProductMPJLambdaWrapper.like(ShopProduct::getProductName,requestVo.getProductName()); + List collect = buyOrderProductDao.selectJoinList(BuyOrderProduct.class, buyOrderProductMPJLambdaWrapper).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList()); + wrapper.in(BuyOrder::getOrderId,collect); + } + Page buyOrderPage = getBaseMapper().selectPage(new Page(requestVo.getPageIndex(), requestVo.getPageSize()), wrapper); + //丰富订单内容 + for (BuyOrder b : buyOrderPage.getRecords()){ + //添加商品信息 + List buyOrderProducts = buyOrderProductDao.selectList(new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, b.getOrderId())); + for (BuyOrderProduct b1:buyOrderProducts){ + ShopProduct byId = shopProductService.getById(b1.getProductId()); + byId.setBooks(shopProductBookService.getBookByProductId(byId.getProductId())); + b1.setProduct(byId); + } + b.setProductList(buyOrderProducts); + //添加快递包裹信息 + LambdaQueryWrapper b_wrapper = new LambdaQueryWrapper<>(); + b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId()); + b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0); + List collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList()); + if(collect.size()>0){ + List expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper().in(ExpressOrder::getId, collect)); + for (ExpressOrder e : expressOrders){ + MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); + buyOrderProductMPJLambdaWrapper.selectAll(ShopProduct.class); + buyOrderProductMPJLambdaWrapper.select(BuyOrderProduct::getQuantity); + buyOrderProductMPJLambdaWrapper.select(BuyOrder::getOrderSn); + buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); + buyOrderProductMPJLambdaWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId); + buyOrderProductMPJLambdaWrapper.eq(BuyOrderProduct::getExpressOrderId,e.getId()); + List shopProducts = buyOrderProductDao.selectJoinList(ShopProduct.class, buyOrderProductMPJLambdaWrapper); + for(ShopProduct s : shopProducts){ + MPJLambdaWrapper shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>(); + shopProductBookEntityMPJLambdaWrapper.selectAll(BookEntity.class); + shopProductBookEntityMPJLambdaWrapper.leftJoin(BookEntity.class,BookEntity::getId,ShopProductBookEntity::getBookId); + shopProductBookEntityMPJLambdaWrapper.eq(ShopProductBookEntity::getProductId,s.getProductId()); + List bookEntities = shopProductBookDao.selectJoinList(BookEntity.class, shopProductBookEntityMPJLambdaWrapper); + s.setBooks(bookEntities); + } + e.setProducts(shopProducts); + } + b.setExpressList(expressOrders); + } + } + return buyOrderPage; + } + + + public Map orderList1(BuyOrderListRequestVo requestVo) { List data = new ArrayList<>(); requestVo.setIndex((requestVo.getPageIndex()-1)*10); List buyOrderList = buyOrderDao.orderList(requestVo);