other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

导出

Browse Source
This commit is contained in:
dimengzhe
2023-03-27 18:22:40 +08:00
parent 314f499dfd
commit 064ab766e8
3 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
View File

@@ -1,10 +1,12 @@
package com.zscat.mallplus.oms.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zscat.mallplus.enums.OrderStatus;
import com.zscat.mallplus.enums.StatusEnum;
import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderItem;
import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
import com.zscat.mallplus.oms.mapper.OmsOrderMapper;
@@ -373,7 +375,18 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
} else {
orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderQuery.getStatus()));
}
return orders;
List<OrderExcelVo> list = new ArrayList<>();
for (OrderExcelVo orderExcelVo : orders){
List<OmsOrderItem> omsOrderItemList = baseMapper.selectOmsOrderItem(orderExcelVo.getOrderSn());
for (OmsOrderItem omsOrderItem : omsOrderItemList){
OrderExcelVo excelVo = new OrderExcelVo();
BeanUtil.copyProperties(orderExcelVo,excelVo);
excelVo.setGoodsName(omsOrderItem.getProductName());
excelVo.setProductQuantity(omsOrderItem.getProductQuantity().toString());
list.add(excelVo);
}
}
return list;
}
@Override
@@ -395,6 +408,17 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
} else {
orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderLocationQuery.getStatus()));
}
return orders;
List<OrderExcelVo> list = new ArrayList<>();
for (OrderExcelVo orderExcelVo : orders){
List<OmsOrderItem> omsOrderItemList = baseMapper.selectOmsOrderItem(orderExcelVo.getOrderSn());
for (OmsOrderItem omsOrderItem : omsOrderItemList){
OrderExcelVo excelVo = new OrderExcelVo();
BeanUtil.copyProperties(orderExcelVo,excelVo);
excelVo.setGoodsName(omsOrderItem.getProductName());
excelVo.setProductQuantity(omsOrderItem.getProductQuantity().toString());
list.add(excelVo);
}
}
return list;
}
}