用户列表增加搜索条件

KKSU

2023-11-07 10ad2e710d2bd52aac31d5d63a7bb6beae76b6a8

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -66,6 +66,18 @@
    public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
        Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
//        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
//        if(CollUtil.isNotEmpty(records)){
//            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
//                Long id = adminMallOrderInfoVo.getId();
//                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
//                StringBuffer stringBuffer = new StringBuffer();
//                for(MallOrderItem mallOrderItem : mallOrderItemList){
//                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
//                }
//                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
//            }
//        }
        return adminMallOrderInfoVos;
    }

@@ -435,6 +447,30 @@
    }

    @Override
    public FebsResponse takeGoods(Long id) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallOrderInfo)){
            return new FebsResponse().fail().message("订单不存在，刷新后重试");
        }
        Integer status = mallOrderInfo.getStatus();
        if(2 != status){
            return new FebsResponse().fail().message("订单不是待发货状态");
        }

        mallOrderInfo.setStatus(3);
        mallOrderInfoMapper.updateById(mallOrderInfo);
        return new FebsResponse().success();
    }

    @Override
    public IPage<AdminMallMoneyFlowVo> orderMoneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo) {
        MallOrderInfo mallOrder = this.baseMapper.selectById(mallOrderInfo.getId());
        Page<AdminMallMoneyFlowVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallMoneyFlowVo> adminMallMoneyFlowVos = mallMoneyFlowMapper.selectOrderMoneyFlowInPage(page, mallOrder);
        return adminMallMoneyFlowVos;
    }

    @Override
    public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
        if (mallOrderInfo == null) {