通用订单列表加分页

This commit is contained in:
wuchunlei
2024-06-04 13:34:27 +08:00
parent a675f9be65
commit 491bcf3320
3 changed files with 16 additions and 7 deletions

View File

@@ -1,6 +1,8 @@
package com.peanut.modules.common.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.peanut.common.utils.R;
import com.peanut.modules.common.entity.BuyOrder;
import com.peanut.modules.common.service.BuyOrderService;
import com.peanut.modules.common.to.PrepareOrderDto;
import lombok.extern.slf4j.Slf4j;
@@ -24,9 +26,10 @@ public class BuyOrderController {
}
//用户订单列表
@RequestMapping("/buyOrderList")
public R buyOrderList(@RequestBody Map params){
return R.ok().put("data",buyOrderService.buyOrderList(params));
@RequestMapping("/commonBuyOrderList")
public R commonBuyOrderList(@RequestBody Map params){
IPage<BuyOrder> page = buyOrderService.commonBuyOrderList(params);
return R.ok().put("data",page);
}
//用户订单各状态下数量

View File

@@ -1,5 +1,6 @@
package com.peanut.modules.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.peanut.modules.common.entity.BuyOrder;
import com.peanut.modules.common.entity.ExpressQueryResponse;
@@ -11,7 +12,7 @@ public interface BuyOrderService extends IService<BuyOrder> {
Map<String,Object> initPrepareOrder(PrepareOrderDto prepareOrderDto);
List<BuyOrder> buyOrderList(Map params);
IPage<BuyOrder> commonBuyOrderList(Map params);
List<Map<String,Object>> getBuyOrderNumByStatus(Map params);

View File

@@ -1,9 +1,13 @@
package com.peanut.modules.common.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.ExpressOrderUtil;
import com.peanut.common.utils.Query;
import com.peanut.modules.common.dao.*;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.BuyOrderService;
@@ -57,7 +61,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
}
@Override
public List<BuyOrder> buyOrderList(Map params) {
public IPage<BuyOrder> commonBuyOrderList(Map params) {
LambdaQueryWrapper<BuyOrder> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(BuyOrder::getUserId,params.get("userId"));
wrapper.eq(BuyOrder::getCome,params.get("come"));
@@ -68,7 +72,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
wrapper.eq(BuyOrder::getOrderStatus,params.get("orderStatus").toString());
}
wrapper.orderByDesc(BuyOrder::getCreateTime);
List<BuyOrder> buyOrderList = this.getBaseMapper().selectList(wrapper);
IPage<BuyOrder> page = this.page(new Query<BuyOrder>().getPage(params),wrapper);
List<BuyOrder> buyOrderList = page.getRecords();
if (buyOrderList.size() > 0){
for(BuyOrder b : buyOrderList){
b.setUser(userDao.selectById(b.getUserId()));
@@ -91,7 +96,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
}
}
}
return buyOrderList;
return page;
}
@Override