订单列表增加按照商品名称查询
This commit is contained in:
@@ -18,6 +18,7 @@ import java.util.List;
|
||||
@Mapper
|
||||
public interface BuyOrderDao extends BaseMapper<BuyOrder> {
|
||||
List<BuyOrder> orderList(BuyOrderListRequestVo requestVo);
|
||||
List<BuyOrder> orderListCount(BuyOrderListRequestVo requestVo);
|
||||
|
||||
List<BuyOrder> orderStatusNum(Integer userId);
|
||||
|
||||
|
||||
@@ -68,6 +68,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
||||
@Autowired
|
||||
private BookService bookService;
|
||||
|
||||
@Autowired
|
||||
private BuyOrderDao buyOrderDao;
|
||||
|
||||
@Autowired
|
||||
private BuyOrderProductService buyOrderProductService;
|
||||
|
||||
@@ -352,25 +355,17 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
||||
|
||||
@Override
|
||||
public Map<String, Object> orderList(BuyOrderListRequestVo requestVo) {
|
||||
Page<BuyOrder> buyOrderPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize());
|
||||
List<BuyOrderResponseVo> data = new ArrayList<>();
|
||||
QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();
|
||||
buyOrderQueryWrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like("order_sn", requestVo.getSearchKeyWord()).or().like("shipping_user", requestVo.getSearchKeyWord()).or().like("user_phone", requestVo.getSearchKeyWord()));
|
||||
buyOrderQueryWrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()), "order_status", requestVo.getOrderStatus());
|
||||
buyOrderQueryWrapper.gt(requestVo.getStartTime() != null, "create_time", requestVo.getStartTime());
|
||||
buyOrderQueryWrapper.lt(requestVo.getEndTime() != null, "create_time", requestVo.getStartTime());
|
||||
buyOrderQueryWrapper.eq("order_type","order");
|
||||
buyOrderQueryWrapper.orderByDesc("create_time");
|
||||
|
||||
Integer totalSize = list(buyOrderQueryWrapper).size();
|
||||
Integer totalPage = totalSize / requestVo.getPageSize() + 1;
|
||||
Page<BuyOrder> page = page(buyOrderPage, buyOrderQueryWrapper);
|
||||
List<BuyOrder> buyOrderList = page.getRecords();
|
||||
requestVo.setIndex((requestVo.getPageIndex()-1)*10);
|
||||
List<BuyOrder> buyOrderList = buyOrderDao.orderList(requestVo);
|
||||
int count = buyOrderDao.orderListCount(requestVo).size();
|
||||
for (BuyOrder buyOrder : buyOrderList) {
|
||||
BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder);
|
||||
data.add(responseVo);
|
||||
}
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
Integer totalSize = count;
|
||||
Integer totalPage = totalSize / requestVo.getPageSize() + 1;
|
||||
result.put("totalDataSize", totalSize);
|
||||
result.put("totalPage", totalPage);
|
||||
result.put("data", data);
|
||||
|
||||
@@ -27,6 +27,10 @@ public class BuyOrderListRequestVo {
|
||||
* 搜索关键词
|
||||
*/
|
||||
private String searchKeyWord;
|
||||
/**
|
||||
* 商品名称
|
||||
*/
|
||||
private String productName;
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user