From 6115e9bb7c70668a4df80ac99cc0dfdd622c17dc Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 24 Dec 2024 15:51:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E7=9A=84=E5=AF=BC=E5=87=BA=202.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E5=8D=95=E5=BC=80=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=94=AF=E4=BB=98=E5=92=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/StatisticsOrderInfoMapper.java | 1 + .../mapper/StatisticsOrderInfoMapper.xml | 150 ++++++++++++++++ .../impl/StatisticsOrderInfoServiceImpl.java | 161 ++++++++++++++++-- .../vo/StatisticsOrderInfoExportVO.java | 71 ++++---- .../service/impl/OpenOrderServiceImpl.java | 6 + 5 files changed, 343 insertions(+), 46 deletions(-) diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java index a0ef71907..6a4a88978 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java @@ -51,4 +51,5 @@ public interface StatisticsOrderInfoMapper extends BaseMapper selectAdvinceDetail(@Param("waybillIds") Set waybillIds, @Param("orderCodes") Set orderCodes); IPage pageList2B(IPage page, @Param("param") MerchantStatisticsDTO merchantStatisticsDTO); + List pageList2BNoPage( @Param("param") MerchantStatisticsDTO merchantStatisticsDTO); } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index 974ad4aea..a98a45841 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -775,6 +775,156 @@ group by lsoi.waybill_id + + delete from logpm_statistics_order_info diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java index 8663d088b..42d023405 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java @@ -36,6 +36,8 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.enums.BooleanZeroOneEnums; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -45,6 +47,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.cache.DictBizCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -1289,23 +1292,157 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl orderInfoListExport(MerchantStatisticsDTO merchantStatisticsDTO) { - List records = baseMapper.orderInfoListExport(merchantStatisticsDTO); - //把records中所有的orderInfoId放入一个集合 - List orderInfoIdList = records.stream().map(StatisticsOrderInfoExportVO::getOrderInfoId).collect(Collectors.toList()); - List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList); - //把orderPackageInfoList转化成以orderInfoId为key的Map - Map orderPackageInfoMap = orderPackageInfoList.stream() - .collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO)); + List result = new ArrayList<>(); + List warehouseIds = warehouseClient.getWarehouseIds(); + if (!warehouseIds.isEmpty()) { + merchantStatisticsDTO.setWarehouseIds(warehouseIds); + } + List statisticsOrderInfoVOIPage = baseMapper.pageList2BNoPage(merchantStatisticsDTO); - records.forEach(statisticsOrderInfoVO -> { - Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); - StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId); - BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO); + + Set waybillIds = statisticsOrderInfoVOIPage.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet()); + + // 查询运单明细集合 + List waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds); + + //得到运单号 + Set orderCodeSet = statisticsOrderInfoVOIPage.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet()); + + + // 通过运单号进行分组 + Map> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId)); + + Map orderPackageInfoMap; + if (CollUtil.isNotEmpty(waybillIds)) { + List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupByWaybillId(waybillIds); + //把orderPackageInfoList转化成以orderInfoId为key的Map + if (CollUtil.isNotEmpty(orderPackageInfoList)) { + orderPackageInfoMap = orderPackageInfoList.stream() + .collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getWaybillId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO)); + } else { + orderPackageInfoMap = null; + } + } else { + orderPackageInfoMap = null; + } + + List advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet); + + statisticsOrderInfoVOIPage.forEach(statisticsOrderInfoVO -> { +// Long waybillId = statisticsOrderInfoVO.getWaybillId(); + + + Long waybillId = statisticsOrderInfoVO.getWaybillId(); + String orderCode = statisticsOrderInfoVO.getOrderCode(); + // 查询站存单上的 + + List advanceDetailDTOList = advanceDetailDTOS.stream(). + filter(advanceDetailDTO -> advanceDetailDTO.getWaybillId().equals(waybillId) && advanceDetailDTO.getOrderCode().equals(orderCode)).collect(Collectors.toList()); + + // 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量 + Map> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName)); + + Long waybillId1 = statisticsOrderInfoVO.getWaybillId(); + if (orderPackageInfoMap != null) { + StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(waybillId1); + + if (statisticsPackageFeeInfoVO != null) { +// statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName()); + BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO); + + if (StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())) { +// String[] split = statisticsOrderInfoVO.getGoodsName().split(","); + List waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId()); + + StringBuffer sb = new StringBuffer(); + StringBuffer sb1 = new StringBuffer(); + StringBuffer sb3 = new StringBuffer(); + + if (collect.isEmpty()) { + + if (!waybillDetailByWaybillNoVos.isEmpty()) { + + for (WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo : waybillDetailByWaybillNoVos) { + + if (!sb3.toString().isEmpty()) { + sb3.append(","); + } + sb3.append(waybillDetailByWaybillNoVo.getProductName()); + + if (!sb.toString().isEmpty()) { + sb.append(","); + } + sb.append(waybillDetailByWaybillNoVo.getNum()); + + if (!sb1.toString().isEmpty()) { + sb1.append(","); + } + sb1.append(waybillDetailByWaybillNoVo.getPrice()); + + } + + } + + } else { + collect.keySet().forEach(s -> { + if (!sb3.toString().isEmpty()) { + sb3.append(","); + } + sb3.append(s); + List advanceDetailDTOS1 = collect.get(s); + Optional first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst(); + + if (first.isPresent()) { + WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get(); + + if (!sb.toString().isEmpty()) { + sb.append(","); + } + + //统计 advanceDetailDTOS1 这个集合种 quantity 的和值 + int sum = advanceDetailDTOS1.stream().mapToInt(AdvanceDetailDTO::getQuantity).sum(); + sb.append(sum); + + if (!sb1.toString().isEmpty()) { + sb1.append(","); + } + sb1.append(waybillDetailByWaybillNoVo.getPrice()); + } + + }); + + } + + statisticsOrderInfoVO.setGoodsName(sb3.toString()); + statisticsOrderInfoVO.setGoodsNum(sb.toString()); + statisticsOrderInfoVO.setGoodsPrice(sb1.toString()); + } + + } + } + + StatisticsOrderInfoExportVO statisticsOrderInfoExportVO = new StatisticsOrderInfoExportVO(); + BeanUtil.copy(statisticsOrderInfoVO, statisticsOrderInfoExportVO); + statisticsOrderInfoExportVO.setTypeServiceName(DistributionTypeConstant.getName(statisticsOrderInfoVO.getTypeService())); + statisticsOrderInfoExportVO.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, statisticsOrderInfoVO.getPayType())); + statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay())); + + String signName = "未签收"; + if (90 == statisticsOrderInfoVO.getSignStatus()) { + signName = "部分签收"; + } else if (100 == statisticsOrderInfoVO.getSignStatus()) { + signName = "已签收"; + } +// statisticsOrderInfoExportVO.setSignStatus(); + statisticsOrderInfoExportVO.setSignStatusName(signName); + + result.add(statisticsOrderInfoExportVO); }); + return result; - return records; +// return records; } @Override diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java index 168018aec..9a62e9111 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java @@ -2,6 +2,7 @@ package com.logpm.statistics.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; import lombok.Data; import java.io.Serializable; @@ -23,7 +24,7 @@ public class StatisticsOrderInfoExportVO implements Serializable { private String orderCode;//订单号 @ExcelProperty(value = "商家服务类型") - private String typeService; // 商家服务类型 + private String typeServiceName; // 商家服务类型 @ExcelProperty(value = "发货单位") private String shipper; // 发货单位 @@ -49,13 +50,15 @@ public class StatisticsOrderInfoExportVO implements Serializable { @ExcelProperty(value = "收货地址") private String consigneeAddress; // 收货地址 - @ExcelProperty(value = "订单签收状态") - private String signStatus; // 订单签收状态 + @ExcelProperty(value = "签收状态") + private String signStatusName; // 订单签收状态 @ExcelProperty(value = "签收时间") - private Date signDate; // 签收时间 + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date signTime; // 签收时间 @ExcelProperty(value = "开单时间") + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date openTime; // 开单时间 @ExcelProperty(value = "发站仓") @@ -73,11 +76,11 @@ public class StatisticsOrderInfoExportVO implements Serializable { @ExcelProperty(value = "客户车次号") private String customerTrain; // 客户车次号 - @ExcelProperty(value = "支付类型") - private String payType; // 支付类型 - @ExcelProperty(value = "支付方式") - private String payWay; // 支付方式 + private String payType; + + @ExcelProperty(value = "付款方式") + private String payWay; // @ExcelProperty(value = "品类名称") private String goodsName; // 物料品类 @@ -148,14 +151,14 @@ public class StatisticsOrderInfoExportVO implements Serializable { @ExcelProperty(value = "配送过路费") private BigDecimal deliveryCrossingFee; - @ExcelProperty(value = "在库周期") - private Integer cycle; // 在库周期 - - @ExcelProperty(value = "结算方类型") - private String cleanObjType; // 结算方 - - @ExcelProperty(value = "费用区间") - private String warehouseFeeInterval; // 费用区间 +// @ExcelProperty(value = "在库周期") +// private Integer cycle; // 在库周期 +// +// @ExcelProperty(value = "结算方类型") +// private String cleanObjType; // 结算方 +// +// @ExcelProperty(value = "费用区间") +// private String warehouseFeeInterval; // 费用区间 @ExcelProperty(value = "安装费") private BigDecimal installFee = BigDecimal.ZERO; // 安装费 @@ -163,24 +166,24 @@ public class StatisticsOrderInfoExportVO implements Serializable { @ExcelProperty(value = "其他费") private BigDecimal otherFee = BigDecimal.ZERO; // 其他费 - @ExcelProperty(value = "签收次数") + @ExcelProperty(value = "签收件数") private Integer signNum; - @ExcelProperty(value = "最后签收时间") - private Date signTime; // 最晚一条 - - @ExcelProperty(value = "同步费用状态") - private Integer syncFeeStatus; - - @ExcelProperty(value = "同步费用时间") - private Date syncFeeDate; - - @ExcelProperty(value = "生成对账单状态") - private Integer createReconciliationOrderStatus; // 0未生成 1已生成 - - @ExcelProperty(value = "生成对账单确认人") - private String createReconciliationUserName; // 生成对账单确认人 - - @ExcelProperty(value = "生成对账单时间") - private Date createReconciliationDate; // 生成对账单时间 +// @ExcelProperty(value = "最后签收时间") +// private Date signTime; // 最晚一条 + +// @ExcelProperty(value = "同步费用状态") +// private Integer syncFeeStatus; +// +// @ExcelProperty(value = "同步费用时间") +// private Date syncFeeDate; + +// @ExcelProperty(value = "生成对账单状态") +// private Integer createReconciliationOrderStatus; // 0未生成 1已生成 +// +// @ExcelProperty(value = "生成对账单确认人") +// private String createReconciliationUserName; // 生成对账单确认人 +// +// @ExcelProperty(value = "生成对账单时间") +// private Date createReconciliationDate; // 生成对账单时间 } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 6e0cdd48b..805a58906 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -740,6 +740,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setReturnStatus(0); waybillEntity.setCheckStatus(0); waybillEntity.setUpdateStatus(0); + waybillEntity.setSettlementStatus("10"); + waybillEntity.setPayStatus("10"); Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity); waybillEntity.setId(waybillId); @@ -1095,6 +1097,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setReturnStatus(0); waybillEntity.setCheckStatus(0); waybillEntity.setUpdateStatus(0); + waybillEntity.setPayStatus("10"); + waybillEntity.setSettlementStatus("10"); + + Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity); waybillEntity.setId(waybillId); List details = new ArrayList<>();