From 113f3a5d3b843fba68ce50a3ba3255c66ca1e15f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 20:13:57 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 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 bd0b34c..6716fb0 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;
}
@@ -107,22 +119,6 @@
@Override
public AdminOrderDetailVo getMallOrderDetailById(long id) {
AdminOrderDetailVo adminOrderDetailVo = mallOrderInfoMapper.getMallOrderDetailById(id);
- MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
- if(ObjectUtil.isNotEmpty(mallExpressInfo)){
- adminOrderDetailVo.setExpressNo(mallExpressInfo.getExpressNo());
- adminOrderDetailVo.setExpressCom(mallExpressInfo.getExpressCom());
- }
- List<MallOrderItem> mallOrderItems = mallOrderInfoMapper.getMallOrderItemByOrderId(id);
- if(CollUtil.isNotEmpty(mallOrderItems)){
- StringBuffer orderItems = new StringBuffer();
- for (MallOrderItem item : mallOrderItems){
- StringBuffer orderItem = new StringBuffer();
- orderItems.append(item.getGoodsName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
- orderItems.append(orderItem);
- }
- adminOrderDetailVo.setOrderItems(orderItems.toString());
- }
-
return adminOrderDetailVo;
}
@@ -435,6 +431,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> moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo) {
+ Page<AdminMallMoneyFlowVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ MallOrderInfo orderInfo = this.baseMapper.selectById(mallOrderInfo.getId());
+ IPage<AdminMallMoneyFlowVo> adminMallMoneyFlowVos = mallMoneyFlowMapper.selectOrderMoneyFlowInPage(page, orderInfo);
+ return adminMallMoneyFlowVos;
+ }
+
+ @Override
public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
if (mallOrderInfo == null) {
--
Gitblit v1.9.1