From 10ad2e710d2bd52aac31d5d63a7bb6beae76b6a8 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 07 Nov 2023 14:35:32 +0800 Subject: [PATCH] 用户列表增加搜索条件 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java index 326cfa4..0a1ff03 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java +++ b/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; } @@ -421,6 +433,44 @@ } @Override + public FebsResponse delOrder(Long id) { + MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id); + if(ObjectUtil.isEmpty(mallOrderInfo)){ + return new FebsResponse().fail().message("订单不存在,请刷新重试"); + } + Integer status = mallOrderInfo.getStatus(); + if(status != 7){ + return new FebsResponse().fail().message("订单不是已取消状态"); + } + mallOrderInfoMapper.deleteById(id); + return new FebsResponse().success(); + } + + @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) { -- Gitblit v1.9.1