From 7ced4fdb47299ca630042075bf58156853912fd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 17:51:21 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 24 ++++++++----------------
1 files changed, 8 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 7d0f04d..04d6ccc 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
@@ -119,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;
}
@@ -463,6 +447,14 @@
}
@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