diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java index a7b9b7ece..146fb6315 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java @@ -322,6 +322,11 @@ public abstract class FanoutConstants { interface QUEUE { String REPORT = "fanout.distribution.DeliveryAndrecheck.report" + ModuleNameConstant.DEVAUTH; + + String waybillStatusLog = "fanout.distribution.DeliveryAndrecheck.waybill.log" + ModuleNameConstant.DEVAUTH; + + + } } @@ -396,6 +401,11 @@ public abstract class FanoutConstants { interface QUEUE { String REPORT = "fanout.BillSignReview.billsignreview.report" + ModuleNameConstant.DEVAUTH; + //增加运单状态的变更日志 + String waybillStatusLog = "fanout.BillSignReview.waybill.log" + ModuleNameConstant.DEVAUTH; + + + } } diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java index 7cc0d3e6c..05279fef0 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java @@ -3,6 +3,7 @@ package org.springblade.common.model; import lombok.Data; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -40,6 +41,13 @@ public class DistributionSignforVO implements Serializable { * 签收车次 */ private String trainNumber; + + + /** + * 配送时间 + */ + private Date deliveryTime; + /** * 预约单ID */ diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java b/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java index 94c7e7e18..87ec1bf1e 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java @@ -8,6 +8,7 @@ import org.springblade.common.enums.PackageTypeEnums; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 提送数据 @@ -138,4 +139,14 @@ public class PackageData implements Serializable { */ private String systemType ; + /** + * 签收时间 + */ + private Date signTime; + + /** + * 签收人 + */ + private String signUser;//签收人 + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java index 00dd9dff6..60dcfc791 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java @@ -3,6 +3,7 @@ package org.springblade.common.model.workNode; import lombok.Data; import org.springblade.common.model.PackageData; +import java.util.Date; import java.util.List; @Data @@ -12,6 +13,28 @@ public class PickUpByScanVO { * 自提单号 */ private String pickupBatch; +// +// /** +// * 车次号 +// */ +// private String trainNumber; + + /** + * 车牌号 + */ + private String carNumber; + + /** + * 司机名称 + */ + private String driverName; + + /** + * 配送时间 + */ + private Date deliveryTime; + + /** * 自提明细数据 diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java index 70a0a2e50..47eb56a67 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java @@ -24,7 +24,12 @@ public class MerchantStatisticsDTO implements Serializable { private Integer confirmStatisticsOrder;//对账状态 0 1 private List reconciliationOrderIds; + private List orderInfoIds; + /** + * 运单ID集合 + */ + private List waybillIds; private Long balanceOrderInfoId; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index aa50e0514..4629e54c1 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -547,6 +547,20 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "文员复核时间 ") private Date signCheckTime; + /** + *付款状态：(null) 10 未付款 20 部分付款 30 已付款 + */ + @ApiModelProperty(value = "付款状态") + private String payStatus; + + /** + * 结算状态：（nul） 10未结算 20 部分结算 30 已结算 + */ + @ApiModelProperty(value = "结算状态") + private String settlementStatus; + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java index 67608f940..407dcc4ba 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java @@ -754,7 +754,6 @@ public class DistributionStockupAppController extends BladeController { } - //todo 这里代码没有写完 等TJJ 和CYZ 空了来写 @ResponseBody @PostMapping("/updateStockup") @ApiOperationSupport(order = 1) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 535798c52..680bb942a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -757,7 +757,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByReCheck(reservationEntity); + NodeFanoutMsg nodeFanoutMsg = buildNodeFanoutMsgByReCheck(deliveryListEntity,reservationEntity); iDistributionNodeWorkService.signForCheck(nodeFanoutMsg, AuthUtil.getUser()); // // 复核作业节点推送 @@ -783,7 +783,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildNodeFanoutMsgByReCheck(DistributionReservationEntity reservationEntity) { + private NodeFanoutMsg buildNodeFanoutMsgByReCheck(DistributionDeliveryListEntity deliveryListEntity,DistributionReservationEntity reservationEntity) { // 查询当前预约单下的定制品和零担签收数据 NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); @@ -798,6 +798,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildPickUpByReCheckVO(billLadingEntity, ladingScanEntities, myCurrentWarehouse); + NodeFanoutMsg nodeFanoutMsg = buildPickUpByReCheckVO(distrilbutionBillLadingEntity, ladingScanEntities, myCurrentWarehouse); iDistributionNodeWorkService.billofladingSignforCheck(nodeFanoutMsg, AuthUtil.getUser()); //推送该自提单的包件运单信息 @@ -4163,13 +4163,17 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); pickUpByReCheckVO.setPackageDataList(packageDataList); ladingScanEntities.forEach(t -> { PackageData packageData = new PackageData(); - + packageData.setSignUser(t.getScanUser()); + packageData.setSignTime(t.getCreateTime()); if ("1".equals(t.getMaterialType())) { // 库存 Long stockListId = t.getStockListId(); @@ -4182,10 +4186,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl and create_time <= #{param.endDate} - and departure_warehouse_id in + and destination_warehouse_id in #{item} @@ -24,7 +24,7 @@ select IFNULL(sum(IFNULL(x_pay,0)+IFNULL(d_pay,0)+IFNULL(y_pay,0)+IFNULL(h_pay,0)),0) from logpm_warehouse_waybill where 1=1 - and departure_warehouse_id in + and destination_warehouse_id in #{item} @@ -45,7 +45,7 @@ and create_time <= #{param.endDate} - and departure_warehouse_id in + and destination_warehouse_id in #{item} @@ -924,7 +924,7 @@ + + + + diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java index 1dc4ccdf0..ba9237674 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java @@ -56,4 +56,10 @@ public interface IStatisticsOrderInfoService extends BaseService waybillIds); + + R createFinishWaybillId(List waybillIds); + + boolean calculateRealCostByWaybillId(Long id); + } 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 6ab9d0508..64d7ef1be 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 @@ -6,11 +6,14 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataPriceClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.vo.BasicdatPriceApiVO; @@ -28,8 +31,11 @@ import com.logpm.statistics.entity.*; import com.logpm.statistics.mapper.StatisticsOrderInfoMapper; import com.logpm.statistics.service.*; import com.logpm.statistics.vo.*; +import com.logpm.warehouse.entity.WarehouseWaybillEntity; +import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springblade.common.enums.BooleanZeroOneEnums; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -63,6 +69,8 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl findListByWaybillId(Long waybillId) { @@ -88,20 +96,35 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl warehouseIds = warehouseClient.getWarehouseIds(); - if(!warehouseIds.isEmpty()){ + if (!warehouseIds.isEmpty()) { merchantStatisticsDTO.setWarehouseIds(warehouseIds); } - IPage statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO); + + //区分 2B 和 2C 的订单 + if (merchantStatisticsDTO.getListType() == 1) { + //2B + return getStatisticsOrderInfoVOIPage2B(merchantStatisticsDTO, page); + + } else { + // 2C + return getStatisticsOrderInfoVOIPage2C(merchantStatisticsDTO, page); + } + + } + + private IPage getStatisticsOrderInfoVOIPage2B(MerchantStatisticsDTO merchantStatisticsDTO, IPage page) { +// IPage statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO); + IPage statisticsOrderInfoVOIPage = baseMapper.pageList2B(page, merchantStatisticsDTO); List records = statisticsOrderInfoVOIPage.getRecords(); - if(CollUtil.isEmpty(records)){ + if (CollUtil.isEmpty(records)) { return statisticsOrderInfoVOIPage; } //把records中所有的orderInfoId放入一个集合 - List orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList()); +// List orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList()); // 得到运单ID集合 - Set waybillIds = records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet()); + Set waybillIds = records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet()); // 查询运单明细集合 List waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds); @@ -114,22 +137,22 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId)); Map orderPackageInfoMap; - if(CollUtil.isNotEmpty(orderInfoIdList)){ - List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList); + if (CollUtil.isNotEmpty(waybillIds)) { + List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupByWaybillId(waybillIds); //把orderPackageInfoList转化成以orderInfoId为key的Map - if(CollUtil.isNotEmpty(orderPackageInfoList)){ + if (CollUtil.isNotEmpty(orderPackageInfoList)) { orderPackageInfoMap = orderPackageInfoList.stream() - .collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO)); + .collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getWaybillId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO)); } else { - orderPackageInfoMap = null; - } - } else { - orderPackageInfoMap = null; - } + orderPackageInfoMap = null; + } + } else { + orderPackageInfoMap = null; + } - List advanceDetailDTOS=baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet); + List advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet); - records.forEach(statisticsOrderInfoVO -> { + records.forEach(statisticsOrderInfoVO -> { // Long waybillId = statisticsOrderInfoVO.getWaybillId(); @@ -140,18 +163,18 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl advanceDetailDTOList = advanceDetailDTOS.stream(). filter(advanceDetailDTO -> advanceDetailDTO.getWaybillId().equals(waybillId) && advanceDetailDTO.getOrderCode().equals(orderCode)).collect(Collectors.toList()); - // 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量 + // 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量 Map> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName)); - Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); - if(orderPackageInfoMap!=null){ - StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId); + Long waybillId1 = statisticsOrderInfoVO.getWaybillId(); + if (orderPackageInfoMap != null) { + StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(waybillId1); - if(statisticsPackageFeeInfoVO!=null){ + if (statisticsPackageFeeInfoVO != null) { // statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName()); BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO); - if(StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())){ + if (StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())) { // String[] split = statisticsOrderInfoVO.getGoodsName().split(","); List waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId()); @@ -159,23 +182,23 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl { - if(!sb3.toString().isEmpty()){ + 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()){ + if (first.isPresent()) { WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get(); - if(!sb.toString().isEmpty()){ + if (!sb.toString().isEmpty()) { sb.append(","); } @@ -204,7 +227,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl getStatisticsOrderInfoVOIPage2C(MerchantStatisticsDTO merchantStatisticsDTO, IPage page) { + IPage statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO); + List records = statisticsOrderInfoVOIPage.getRecords(); + if (CollUtil.isEmpty(records)) { + return statisticsOrderInfoVOIPage; + } + + //把records中所有的orderInfoId放入一个集合 + List orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList()); + // 得到运单ID集合 + Set waybillIds = records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet()); + + // 查询运单明细集合 + List waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds); + + //得到运单号 + Set orderCodeSet = records.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet()); + + + // 通过运单号进行分组 + Map> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId)); + + Map orderPackageInfoMap; + if (CollUtil.isNotEmpty(orderInfoIdList)) { + List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList); + //把orderPackageInfoList转化成以orderInfoId为key的Map + if (CollUtil.isNotEmpty(orderPackageInfoList)) { + orderPackageInfoMap = orderPackageInfoList.stream() + .collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO)); + } else { + orderPackageInfoMap = null; + } + } else { + orderPackageInfoMap = null; + } + + List advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet); + records.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 orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); + if (orderPackageInfoMap != null) { + StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId); + + 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 != null && !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); + + if (waybillDetailByWaybillNoVos != null) { + 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()); + } + + } + } + + }); statisticsOrderInfoVOIPage.setRecords(records); return statisticsOrderInfoVOIPage; } @@ -244,7 +407,6 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl list = changesRecordService.list(queryWrapper); - if (CollUtil.isNotEmpty(list)) { // 获取list中所有元素的id @@ -318,9 +480,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl 1){ + if (consigneeIdSet.size() > 1) { log.warn("############checkBalance: 对账单商家不相同={} ", consigneeIdSet); throw new CustomerException(405, "对账单商家不相同"); } - if(destinationWarehouseIdSet.size() > 1){ + if (destinationWarehouseIdSet.size() > 1) { log.warn("############checkBalance: destinationWarehouseIdSet={} ", destinationWarehouseIdSet); throw new CustomerException(405, "对账单目的仓不相同"); } @@ -379,7 +541,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList()); - if(CollUtil.isNotEmpty(orderInfoIdList)){ + if (CollUtil.isNotEmpty(orderInfoIdList)) { List orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList); //把orderPackageInfoList转化成以orderInfoId为key的Map Map orderPackageInfoMap = orderPackageInfoList.stream() @@ -541,7 +703,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl distributionPackageEntities = distributionPackageService.list(new QueryWrapper().lambda().eq(StatisticsDistributionPackageEntity::getWaybillId, id)); + // 校验是否全部配送完成 + if (CollUtil.isEmpty(distributionPackageEntities) || distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == null || NumberUtil.equals(0, distributionPackageEntity.getIsSign()))) { + log.warn("#############calculateRealCost: 订单未全部配送完成，无法计算。"); + throw new CustomerException(405, "订单未全部配送完成，无法计算。"); + } + List warehousePackageEntities = warehousePackageService.list(new QueryWrapper().lambda().eq(StatisticsWarehousePackageEntity::getWaybillId, id)); + PriceDispatchVO dispatch = price.getDispatch(); + PriceWarehouseVO warehouse = price.getWarehouse(); + + BasicdataPriceTemplateEntity template = price.getTemplate(); + if (ObjectUtil.isEmpty(template)) { + log.warn("#############calculateRealCost: 未维护模版，无法计算。"); + throw new CustomerException(405, "未维护模版，无法计算。"); + } + String serviceType = template.getServiceType(); + Integer dispatchIsMinCost = template.getDispatchIsMinCost(); + + BasicdataClientEntity entityById = basicdataClientClient.findEntityById(consigneeId); + + // 模版的服务类型 + String typeService = String.valueOf(entityById.getTypeService()); + if (StrUtil.isNotEmpty(serviceType)) { + // 模版是否有仓储 + if (StrUtil.contains(serviceType, "3")) { + if (CollUtil.isNotEmpty(warehousePackageEntities)) { + calculateWarehouseCost(warehouse, warehousePackageEntities, template); + } + } + // 模版是否有配送 + if (StrUtil.contains(serviceType, "4")) { + if (CollUtil.isNotEmpty(distributionPackageEntities)) { + calculateDispatchCost(template, typeService, distributionPackageEntities, dispatch, dispatchIsMinCost, brandId, consigneeId); + } + } + } + + lambdaUpdate().set(StatisticsOrderInfoEntity::getSyncFeeStatus, 1).set(StatisticsOrderInfoEntity::getSyncFeeDate, new Date()).eq(StatisticsOrderInfoEntity::getWaybillId, id).update(); + +// orderInfoEntity.setSyncFeeStatus(1); +// orderInfoEntity.setSyncFeeDate(new Date()); +// updateById(orderInfoEntity); + + + return Boolean.TRUE; } + @Override public StatisticsPackageFeeInfoVO findPackageListByOrderIds(List orderInfoIdsList) { return baseMapper.findPackageListByOrderIds(orderInfoIdsList); @@ -564,9 +799,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl orderInfoEntities = baseMapper.selectBatchIds(orderInfoIds); - if(CollUtil.isEmpty(orderInfoEntities)){ + if (CollUtil.isEmpty(orderInfoEntities)) { log.warn("############createReconciliationOrder: 未找到对应订单信息"); - return R.fail(405,"未找到对应订单信息"); + return R.fail(405, "未找到对应订单信息"); } @@ -577,24 +812,24 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> groupByConsigneeId = orderInfoEntities.stream().collect(Collectors.groupingBy(StatisticsOrderInfoEntity::getConsigneeId)); int consigneeSize = groupByConsigneeId.keySet().size(); - if(consigneeSize > 1){ + if (consigneeSize > 1) { log.warn("############createReconciliationOrder: 订单不属于同一个商家"); - return R.fail(405,"订单不属于同一个商家"); + return R.fail(405, "订单不属于同一个商家"); } Map> groupByDestinationWarehouseId = orderInfoEntities.stream().collect(Collectors.groupingBy(StatisticsOrderInfoEntity::getDestinationWarehouseId)); int destinationWarehouseIdSize = groupByDestinationWarehouseId.keySet().size(); - if(destinationWarehouseIdSize > 1){ + if (destinationWarehouseIdSize > 1) { log.warn("############createReconciliationOrder: 订单不属于同一个目的仓"); - return R.fail(405,"订单不属于同一个目的仓"); + return R.fail(405, "订单不属于同一个目的仓"); } StatisticsPackageFeeInfoVO orderPackageTotalVO = baseMapper.findPackageListByOrderIds(orderInfoIds); BigDecimal freightPrice = orderPackageTotalVO.getFreightPrice(); @@ -612,7 +847,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl updateList = new ArrayList<>(); orderInfoEntities.forEach(orderInfoEntity -> { @@ -682,6 +917,272 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl waybillIds) { +// List orderInfoEntities = baseMapper.selectBatchIds(orderInfoIds); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + queryWrapper.in(StatisticsOrderInfoEntity::getWaybillId, waybillIds); + queryWrapper.eq(StatisticsOrderInfoEntity::getConfirmBalanceOrderStatus, 0); + + List orderInfoEntities = baseMapper.selectList(queryWrapper); + if (CollUtil.isEmpty(orderInfoEntities)) { + log.warn("############createReconciliationOrder: 未找到对应订单信息"); + return R.fail(405, "未找到对应订单信息"); + } + + + List orderInfoIds = orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getId).collect(Collectors.toList()); + + for (StatisticsOrderInfoEntity orderInfoEntity : orderInfoEntities) { + if (orderInfoEntity.getTypeService() != null && orderInfoEntity.getTypeService() != 2) { + continue; + } + Integer syncFeeStatus = orderInfoEntity.getSyncFeeStatus(); + Long orderId = orderInfoEntity.getId(); + String orderCode = orderInfoEntity.getOrderCode(); + if (syncFeeStatus == 0) { + log.warn("############createReconciliationOrder: 订单还未计算价格的数据 orderId={}", orderId); + return R.fail(405, "订单[" + orderCode + "]未计算价格的数据"); + } + } + + //判断orderInfoEntities中所有元素通过consigneeId进行分组 + Map> groupByConsigneeId = orderInfoEntities.stream().collect(Collectors.groupingBy(StatisticsOrderInfoEntity::getConsigneeId)); + int consigneeSize = groupByConsigneeId.keySet().size(); + if (consigneeSize > 1) { + log.warn("############createReconciliationOrder: 订单不属于同一个商家"); + return R.fail(405, "订单不属于同一个商家"); + } + Map> groupByDestinationWarehouseId = orderInfoEntities.stream().collect(Collectors.groupingBy(StatisticsOrderInfoEntity::getDestinationWarehouseId)); + int destinationWarehouseIdSize = groupByDestinationWarehouseId.keySet().size(); + if (destinationWarehouseIdSize > 1) { + log.warn("############createReconciliationOrder: 订单不属于同一个目的仓"); + return R.fail(405, "订单不属于同一个目的仓"); + } + StatisticsPackageFeeInfoVO orderPackageTotalVO = baseMapper.findPackageListByOrderIds(orderInfoIds); + BigDecimal freightPrice = orderPackageTotalVO.getFreightPrice(); + BigDecimal systemFreightPrice = orderPackageTotalVO.getSystemFreightPrice(); + BigDecimal pickupPrice = orderPackageTotalVO.getPickupPrice(); + BigDecimal systemPickupPrice = orderPackageTotalVO.getSystemPickupPrice(); + BigDecimal warehouseServiceFee = orderPackageTotalVO.getWarehouseServiceFee(); + BigDecimal deliveryServiceFee = orderPackageTotalVO.getDeliveryServiceFee(); + BigDecimal totalFee = freightPrice.add(pickupPrice).add(warehouseServiceFee).add(deliveryServiceFee); + BigDecimal sysTotalFee = systemFreightPrice.add(systemPickupPrice).add(warehouseServiceFee).add(deliveryServiceFee); + + StatisticsOrderInfoEntity statisticsOrderInfoEntity = orderInfoEntities.get(0); + Long consigneeId = statisticsOrderInfoEntity.getConsigneeId(); + String consignee = statisticsOrderInfoEntity.getConsignee(); + Long destinationWarehouseId = statisticsOrderInfoEntity.getDestinationWarehouseId(); + String destinationWarehouseName = statisticsOrderInfoEntity.getDestinationWarehouseName(); + + String reconciliationOrdeCode = "DZD" + System.currentTimeMillis(); + + StatisticsReconciliationOrderInfoEntity reconciliationOrder = new StatisticsReconciliationOrderInfoEntity(); + reconciliationOrder.setReconciliationOrderNo(reconciliationOrdeCode); + //把orderInfoEntities中所有waybillNo去重拼接起来 + reconciliationOrder.setWaybillNo(orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getWaybillNo).distinct().collect(Collectors.joining(","))); + // 增加运单的制单时间 +// reconciliationOrder.setWaybillCreateTime(orderInfoEntities.get(0).getWaybillCreateTime()); + + reconciliationOrder.setOrderCode(orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getOrderCode).distinct().collect(Collectors.joining(","))); + reconciliationOrder.setBrand(orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getBrand).distinct().collect(Collectors.joining(","))); + reconciliationOrder.setConsigneeId(consigneeId); + reconciliationOrder.setConsignee(consignee); + reconciliationOrder.setDestinationWarehouseName(destinationWarehouseName); + reconciliationOrder.setDestinationWarehouseId(destinationWarehouseId); + reconciliationOrder.setTotalNum(orderPackageTotalVO.getTotalNum()); + reconciliationOrder.setTotalWeight(orderPackageTotalVO.getTotalWeight()); + reconciliationOrder.setTotalVolume(orderPackageTotalVO.getTotalVolume()); + + reconciliationOrder.setSystemTotalFee(sysTotalFee); + reconciliationOrder.setRealTotalFee(totalFee); + reconciliationOrder.setPickupFee(pickupPrice); + reconciliationOrder.setFreightFee(freightPrice); + reconciliationOrder.setWarehouseServiceFee(warehouseServiceFee); + reconciliationOrder.setWarehouseFee(orderPackageTotalVO.getWarehouseFee()); + reconciliationOrder.setWarehouseManageFee(orderPackageTotalVO.getWarehouseManageFee()); + reconciliationOrder.setWarehouseSortingFee(orderPackageTotalVO.getWarehouseSortingFee()); + reconciliationOrder.setWarehouseOperatingFee(orderPackageTotalVO.getWarehouseOperatingFee()); + reconciliationOrder.setDeliveryFee(orderPackageTotalVO.getDeliveryFee()); + reconciliationOrder.setDeliveryServiceFee(deliveryServiceFee); + reconciliationOrder.setDeliveryLoadingFee(orderPackageTotalVO.getDeliveryLoadingFee()); + reconciliationOrder.setDeliverySortingFee(orderPackageTotalVO.getDeliverySortingFee()); + reconciliationOrder.setDeliveryUpfloorFee(orderPackageTotalVO.getDeliveryUpfloorFee()); + reconciliationOrder.setDeliveryMoveFee(orderPackageTotalVO.getDeliveryMoveFee()); + reconciliationOrder.setDeliveryOtherFee(orderPackageTotalVO.getDeliveryOtherFee()); + reconciliationOrder.setDeliveryCrossingFee(orderPackageTotalVO.getDeliveryCrossingFee()); + reconciliationOrder.setInstallFee(BigDecimal.ZERO); + reconciliationOrder.setOtherFee(BigDecimal.ZERO); + + reconciliationOrder.setIsAftersale(0); +// reconciliationOrder.setH(BigDecimal.ZERO); + + reconciliationOrder.setCreateUserName(AuthUtil.getNickName()); + + reconciliationOrder.setIsChanges(0); + reconciliationOrder.setChangesFee(BigDecimal.ZERO); + + reconciliationOrder.setCheckStatus(0); + + + boolean saveFlag = reconciliationOrderInfoService.save(reconciliationOrder); + if (saveFlag) { + Long reconciliationOrderId = reconciliationOrder.getId(); + List updateList = new ArrayList<>(); + orderInfoEntities.forEach(orderInfoEntity -> { + StatisticsOrderInfoEntity updateEntity = new StatisticsOrderInfoEntity(); + updateEntity.setId(orderInfoEntity.getId()); + updateEntity.setCreateReconciliationOrderStatus(1); + updateEntity.setCreateReconciliationUserName(AuthUtil.getNickName()); + updateEntity.setCreateReconciliationDate(new Date()); + updateEntity.setReconciliationOrderId(reconciliationOrderId); + updateEntity.setReconciliationOrderNo(reconciliationOrdeCode); + updateList.add(updateEntity); + }); + updateBatchById(updateList); + } + return R.success("生成成功"); + } + + + @Transactional + @Override + public R createFinishWaybillId(List waybillIds) { + + for (Long waybillId : waybillIds) { + WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); + if (Objects.isNull(waybillEntity)) { + log.error("############createBalanceOrder: 运单不存在 waybillId={}", waybillId); + } + +// List wayBillDetailList = warehouseWaybillDetailClient.findByWaybillId(waybillId); + //把wayBillDetailList中所有productName用逗号拼起来 +// String productTypeNum = wayBillDetailList.stream().map(t->t.getProductName()+"("+t.getNum()+")").collect(Collectors.joining(",")); +// String productTypePrice = wayBillDetailList.stream().map(t->t.getProductName()+"("+t.getPrice()+")").collect(Collectors.joining(",")); + + List orderInfoEntityList = this.findListByWaybillId(waybillId); + //把orderInfoEntityList中所有id放入一个list，以便查询所有包件信息 + List orderInfoIdsList = orderInfoEntityList.stream().map(StatisticsOrderInfoEntity::getId).collect(Collectors.toList()); + + StatisticsPackageFeeInfoVO trunklinePackageFeeVO = this.findPackageListByOrderIds(orderInfoIdsList); + + String balanceOrderCode = "JSD" + System.currentTimeMillis(); + + BigDecimal freightPrice = trunklinePackageFeeVO.getFreightPrice(); + BigDecimal pickupPrice = trunklinePackageFeeVO.getPickupPrice(); + BigDecimal warehouseServiceFee = trunklinePackageFeeVO.getWarehouseServiceFee(); + BigDecimal deliveryServiceFee = trunklinePackageFeeVO.getDeliveryServiceFee(); + BigDecimal totalFee = freightPrice.add(pickupPrice).add(warehouseServiceFee).add(deliveryServiceFee); + + StatisticsBalanceOrderInfoEntity balanceOrderInfoEntity = new StatisticsBalanceOrderInfoEntity(); + balanceOrderInfoEntity.setBalanceOrderNo(balanceOrderCode); + balanceOrderInfoEntity.setBrand(waybillEntity.getBrand()); + balanceOrderInfoEntity.setWaybillNo(waybillEntity.getWaybillNo()); + //把orderInfoEntityList中所有orderCode用逗号拼起来 + balanceOrderInfoEntity.setOrderCode(orderInfoEntityList.stream().map(StatisticsOrderInfoEntity::getOrderCode).collect(Collectors.joining(","))); + balanceOrderInfoEntity.setTypeService(waybillEntity.getServiceType()); + + balanceOrderInfoEntity.setTotalBalanceFee(totalFee); + balanceOrderInfoEntity.setRealTotalFee(totalFee); + balanceOrderInfoEntity.setTotalCount(trunklinePackageFeeVO.getTotalNum()); + balanceOrderInfoEntity.setTotalWeight(trunklinePackageFeeVO.getTotalWeight()); + balanceOrderInfoEntity.setTotalVolume(trunklinePackageFeeVO.getTotalVolume()); + balanceOrderInfoEntity.setConsigneeId(waybillEntity.getConsigneeId()); + balanceOrderInfoEntity.setConsignee(waybillEntity.getConsignee()); + balanceOrderInfoEntity.setPickupFee(pickupPrice); + balanceOrderInfoEntity.setFreightFee(freightPrice); + balanceOrderInfoEntity.setWarehouseServiceFee(warehouseServiceFee); + balanceOrderInfoEntity.setWarehouseFee(trunklinePackageFeeVO.getWarehouseFee()); + balanceOrderInfoEntity.setWarehouseManageFee(trunklinePackageFeeVO.getWarehouseManageFee()); + balanceOrderInfoEntity.setWarehouseSortingFee(trunklinePackageFeeVO.getWarehouseSortingFee()); + balanceOrderInfoEntity.setWarehouseOperatingFee(trunklinePackageFeeVO.getWarehouseOperatingFee()); + balanceOrderInfoEntity.setDeliveryFee(trunklinePackageFeeVO.getDeliveryFee()); + balanceOrderInfoEntity.setDeliveryServiceFee(deliveryServiceFee); + balanceOrderInfoEntity.setDeliveryLoadingFee(trunklinePackageFeeVO.getDeliveryLoadingFee()); + balanceOrderInfoEntity.setDeliverySortingFee(trunklinePackageFeeVO.getDeliverySortingFee()); + balanceOrderInfoEntity.setDeliveryUpfloorFee(trunklinePackageFeeVO.getDeliveryUpfloorFee()); + balanceOrderInfoEntity.setDeliveryMoveFee(trunklinePackageFeeVO.getDeliveryMoveFee()); + balanceOrderInfoEntity.setDeliveryCrossingFee(trunklinePackageFeeVO.getDeliveryCrossingFee()); + balanceOrderInfoEntity.setDeliveryOtherFee(trunklinePackageFeeVO.getDeliveryOtherFee()); + balanceOrderInfoEntity.setOtherFee(BigDecimal.ZERO); + balanceOrderInfoEntity.setInstallFee(BigDecimal.ZERO); + + balanceOrderInfoEntity.setIsAftersale(0); + balanceOrderInfoEntity.setAftersalesFee(BigDecimal.ZERO); + + balanceOrderInfoEntity.setBalanceStatus(2); + balanceOrderInfoEntity.setHasBalanceFee(balanceOrderInfoEntity.getTotalBalanceFee()); + balanceOrderInfoEntity.setBalanceUserName(AuthUtil.getUserName()); + balanceOrderInfoEntity.setBalanceTime(new Date(System.currentTimeMillis())); + +// balanceOrderInfoEntity.setHasBalanceFee(BigDecimal.ZERO); + balanceOrderInfoEntity.setNoBalanceFee(BigDecimal.ZERO); + balanceOrderInfoEntity.setAbnormalBalanceStatus(0); + balanceOrderInfoEntity.setAbnormalBalanceFee(BigDecimal.ZERO); + + balanceOrderInfoEntity.setDestinationWarehouseId(waybillEntity.getDestinationWarehouseId()); + balanceOrderInfoEntity.setDestinationWarehouseName(waybillEntity.getDestinationWarehouseName()); + + boolean saveFlag = balanceOrderInfoService.save(balanceOrderInfoEntity); + if (saveFlag) { + Long balanceOrderId = balanceOrderInfoEntity.getId(); + List updateOrderInfoList = new ArrayList<>(); + orderInfoEntityList.forEach(orderInfoEntity -> { + StatisticsOrderInfoEntity updateEntity = new StatisticsOrderInfoEntity(); + updateEntity.setId(orderInfoEntity.getId()); + updateEntity.setBalanceOrderId(balanceOrderId); + updateEntity.setBalanceOrderNo(balanceOrderCode); + updateEntity.setCreateReconciliationOrderStatus(1); + updateEntity.setCreateReconciliationUserName(AuthUtil.getNickName()); + updateEntity.setCreateReconciliationDate(new Date()); + updateEntity.setConfirmBalanceOrderStatus(1); + updateEntity.setConfirmBalanceDate(new Date()); + updateEntity.setConfirmBalanceUserName(AuthUtil.getNickName()); + updateOrderInfoList.add(updateEntity); + }); + if (CollUtil.isNotEmpty(updateOrderInfoList)) { + this.updateBatchById(updateOrderInfoList); + } + } + + + // 保存结算记录 + StatisticsBalanceRecordEntity balanceRecordEntity = new StatisticsBalanceRecordEntity(); + balanceRecordEntity.setBalanceOrderInfoId(balanceOrderInfoEntity.getId()); + balanceRecordEntity.setBalanceUserName(AuthUtil.getNickName()); + balanceRecordEntity.setBalanceRemark("批量完成结算"); + balanceRecordEntity.setBalanceFee(totalFee); + balanceRecordService.save(balanceRecordEntity); + } + + // 批量更新运单状态 + List te = warehouseWaybillClient.findListByWaybillIds(waybillIds); + List data = new ArrayList<>(); + te.forEach(waybillEntity ->{ + WarehouseWaybillEntity t = new WarehouseWaybillEntity(); + t.setId(waybillEntity.getId()); + t.setPayStatus("30"); + t.setSettlementStatus("30"); + data.add(t); + + + }); + + + + + warehouseWaybillClient.updateList(data); + + + return R.success("操作成功"); + + + + } + @Override public R findAftersalesOrderList(Long consigneeId) { @@ -696,21 +1197,21 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl aftersalesOrderDTOS = merchantStatisticsDTO.getAftersalesOrderDTOS(); - if(CollUtil.isEmpty(aftersalesOrderDTOS)){ - log.warn("#########addAftersalesToReconciliationOrder: 请选择售后单 aftersalesOrderDTOS={}",aftersalesOrderDTOS); - return R.fail(405,"请选择售后单"); + if (CollUtil.isEmpty(aftersalesOrderDTOS)) { + log.warn("#########addAftersalesToReconciliationOrder: 请选择售后单 aftersalesOrderDTOS={}", aftersalesOrderDTOS); + return R.fail(405, "请选择售后单"); } //把aftersalesOrderDTOS中所有元素的aftersalesFee 求和 @@ -728,7 +1229,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl orderInfoIds) { StatisticsReconciliationOrderInfoEntity reconciliationOrderInfo = reconciliationOrderInfoService.getById(reconciliationOrderId); - if(Objects.isNull(reconciliationOrderInfo)){ - log.warn("#########cancleOrderInfoBindReconcilitionOrder: 对账单信息不存在 reconciliationOrderId={}",reconciliationOrderId); - return R.fail(405,"对账单信息不存在"); + if (Objects.isNull(reconciliationOrderInfo)) { + log.warn("#########cancleOrderInfoBindReconcilitionOrder: 对账单信息不存在 reconciliationOrderId={}", reconciliationOrderId); + return R.fail(405, "对账单信息不存在"); } Integer checkStatus = reconciliationOrderInfo.getCheckStatus(); - if(checkStatus == 1){ - log.warn("#########cancleOrderInfoBindReconcilitionOrder: 对账单已确认对账 reconciliationOrderId={}",reconciliationOrderId); - return R.fail(405,"对账单已确认对账"); + if (checkStatus == 1) { + log.warn("#########cancleOrderInfoBindReconcilitionOrder: 对账单已确认对账 reconciliationOrderId={}", reconciliationOrderId); + return R.fail(405, "对账单已确认对账"); } - baseMapper.clearReconcilitionOrderInfoByOrderInfoIds(orderInfoIds,AuthUtil.getNickName(),new Date()); + baseMapper.clearReconcilitionOrderInfoByOrderInfoIds(orderInfoIds, AuthUtil.getNickName(), new Date()); //重新计算对账单的数据 calculateReconcilitionOrder(reconciliationOrderInfo); @@ -801,19 +1302,19 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl balanceOrderIds = baseMapper.findBalanceOrderIdListByWaybillId(waybillId); - if(CollUtil.isNotEmpty(balanceOrderIds)){ + if (CollUtil.isNotEmpty(balanceOrderIds)) { QueryWrapper balanceAbnormalEntityQueryWrapper = new QueryWrapper<>(); balanceAbnormalEntityQueryWrapper.in("balance_order_info_id", balanceOrderIds); List list = balanceRecordService.list(balanceAbnormalEntityQueryWrapper); - if(CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { return 1; - }else{ + } else { return 0; } - }else{ + } else { return 0; } } @@ -849,11 +1350,11 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl orderInfoIds = baseMapper.findOrderInfoIdListByReconciliationOrderIds(reconciliationOrderIdList); - if(CollUtil.isNotEmpty(orderInfoIds)){ + if (CollUtil.isNotEmpty(orderInfoIds)) { List orderInfoEntities = baseMapper.selectBatchIds(orderInfoIds); - if(CollUtil.isEmpty(orderInfoEntities)){ + if (CollUtil.isEmpty(orderInfoEntities)) { log.warn("############calculateReconcilitionOrder: 未找到对应订单信息"); - throw new CustomerException(405,"未找到对应订单信息"); + throw new CustomerException(405, "未找到对应订单信息"); } @@ -861,24 +1362,24 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl> groupByConsigneeId = orderInfoEntities.stream().collect(Collectors.groupingBy(StatisticsOrderInfoEntity::getConsigneeId)); int consigneeSize = groupByConsigneeId.keySet().size(); - if(consigneeSize > 1){ + if (consigneeSize > 1) { log.warn("############calculateReconcilitionOrder: 订单不属于同一个商家"); - throw new CustomerException(405,"订单不属于同一个商家"); + throw new CustomerException(405, "订单不属于同一个商家"); } Map> groupByDestinationWarehouseId = orderInfoEntities.stream().collect(Collectors.groupingBy(StatisticsOrderInfoEntity::getDestinationWarehouseId)); int destinationWarehouseIdSize = groupByDestinationWarehouseId.keySet().size(); - if(destinationWarehouseIdSize > 1){ + if (destinationWarehouseIdSize > 1) { log.warn("############calculateReconcilitionOrder: 订单不属于同一个目的仓"); - throw new CustomerException(405,"订单不属于同一个目的仓"); + throw new CustomerException(405, "订单不属于同一个目的仓"); } StatisticsPackageFeeInfoVO orderPackageTotalVO = baseMapper.findPackageListByOrderIds(orderInfoIds); BigDecimal freightPrice = orderPackageTotalVO.getFreightPrice(); @@ -928,13 +1429,11 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl warehousePackageEntities, BasicdataPriceTemplateEntity template) { @@ -976,66 +1475,66 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl trainNumberSet = distributionPackageEntities.stream().map(StatisticsDistributionPackageEntity::getTrainNumber).collect(Collectors.toSet()); - List distributionPackageEntities1 = distributionPackageService.list(Wrappers.lambdaQuery() - .in(StatisticsDistributionPackageEntity::getTrainNumber, trainNumberSet)); - for (String s : trainNumberSet) { - if(CollUtil.isNotEmpty(distributionPackageEntities1)){ - List packageEntities = distributionPackageEntities1.stream() - .filter(entity -> ObjectUtil.equals(s, entity.getTrainNumber())) - .filter(entity -> ObjectUtil.equals(entity.getBrandId(), brandId)) - .filter(entity -> ObjectUtil.equals(entity.getConsigneeId(), consigneeId)) - .collect(Collectors.toList()); - if(CollUtil.isNotEmpty(packageEntities)){ - buildDispatchCostToPackage(dispatchMinCostType, packageEntities, minCost, additionalCost); - } + } + // 保底价 + // 1 是否有最低价 2 最低价的计费类型是按订单还是按配送任务 3 按价格还是件方重量 + if (ObjectUtil.equals(BooleanZeroOneEnums.YES.getCode(), dispatchIsMinCost)) { + // 1 订单 2 配送任务 + Integer dispatchMinCostMode = template.getDispatchMinCostMode(); + // 1 价格 2 件 3 方 4 重量 + Integer dispatchMinCostType = template.getDispatchMinCostType(); + // 最低价 + Double minCost = dispatch.getMinCost(); + // 加算价格 + Double additionalCost = dispatch.getAdditionalCost(); + if (ObjectUtil.equals(1, dispatchMinCostMode)) { + buildDispatchCostToPackage(dispatchMinCostType, distributionPackageEntities, minCost, additionalCost); + } else if (ObjectUtil.equals(2, dispatchMinCostMode)) { + // 按配送任务 计算规则 1 取出包件中所有的配送任务号 2 按配送任务号查出所有包件信息 3 按品牌和收货单位过滤（可能存在同一个配送任务存在同一客户不同订单情况） 4 按配送任务分组计算 + Set trainNumberSet = distributionPackageEntities.stream().map(StatisticsDistributionPackageEntity::getTrainNumber).collect(Collectors.toSet()); + List distributionPackageEntities1 = distributionPackageService.list(Wrappers.lambdaQuery() + .in(StatisticsDistributionPackageEntity::getTrainNumber, trainNumberSet)); + for (String s : trainNumberSet) { + if (CollUtil.isNotEmpty(distributionPackageEntities1)) { + List packageEntities = distributionPackageEntities1.stream() + .filter(entity -> ObjectUtil.equals(s, entity.getTrainNumber())) + .filter(entity -> ObjectUtil.equals(entity.getBrandId(), brandId)) + .filter(entity -> ObjectUtil.equals(entity.getConsigneeId(), consigneeId)) + .collect(Collectors.toList()); + if (CollUtil.isNotEmpty(packageEntities)) { + buildDispatchCostToPackage(dispatchMinCostType, packageEntities, minCost, additionalCost); } } - // Map> map = distributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getTrainNumber)); - // if (CollUtil.isNotEmpty(map)) { - // for (Map.Entry> entry : map.entrySet()) { - // List value = entry.getValue(); - // buildDispatchCostToPackage(dispatchMinCostType, value, minCost, additionalCost); - // } - // } } + // Map> map = distributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getTrainNumber)); + // if (CollUtil.isNotEmpty(map)) { + // for (Map.Entry> entry : map.entrySet()) { + // List value = entry.getValue(); + // buildDispatchCostToPackage(dispatchMinCostType, value, minCost, additionalCost); + // } + // } } + } - // 保存配送包件信息 - if (CollUtil.isNotEmpty(distributionPackageEntities)) { - // 计算配送服务费 realDeliveryServiceFee = 所有real费用的和 - distributionPackageEntities.stream().forEach(entity -> { - entity.setDeliveryServiceFee(entity.getDeliveryFee() - .add(entity.getDeliveryLoadingFee()) - .add(entity.getDeliveryMoveFee()) - .add(entity.getDeliveryCrossingFee()) - .add(entity.getDeliverySortingFee()) - .add(entity.getDeliveryUpfloorFee())); - }); - distributionPackageService.saveOrUpdateBatch(distributionPackageEntities); - } + // 保存配送包件信息 + if (CollUtil.isNotEmpty(distributionPackageEntities)) { + // 计算配送服务费 realDeliveryServiceFee = 所有real费用的和 + distributionPackageEntities.stream().forEach(entity -> { + entity.setDeliveryServiceFee(entity.getDeliveryFee() + .add(entity.getDeliveryLoadingFee()) + .add(entity.getDeliveryMoveFee()) + .add(entity.getDeliveryCrossingFee()) + .add(entity.getDeliverySortingFee()) + .add(entity.getDeliveryUpfloorFee())); + }); + distributionPackageService.saveOrUpdateBatch(distributionPackageEntities); + } // } } @@ -1054,7 +1553,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl details = vo.getPackageDataList(); + + // 按照运单号进行分组 后面的集合 按照创建时间进行排序 + Map> map = details.stream().collect(Collectors.groupingBy(PackageData::getWaybillNumber)); + // 根据运单号 统计 每个运单的数量 + Map waybillCountMap = new HashMap<>(); + + for (PackageData packageData : details) { + String waybillNumber = packageData.getWaybillNumber(); + waybillCountMap.put(waybillNumber, waybillCountMap.getOrDefault(waybillNumber, 0) + packageData.getNumber()); + } + Set strings = waybillCountMap.keySet(); + + for (String waybillNumber : strings) { + + WaybillLogDTO t = new WaybillLogDTO(); + List packageDataList = map.get(waybillNumber); + if (packageDataList != null && !packageDataList.isEmpty()) { + packageDataList.sort(Comparator.comparing(PackageData::getSignTime)); + // 获取排序第一个 + t.setSignUser(packageDataList.get(0).getSignUser()); + t.setSignTime(packageDataList.get(0).getSignTime()); + } + t.setWaybillNo(waybillNumber); + t.setWarehouseName(bean.getWarehouse()); + t.setWarehouseId(warehouseId); + + t.setTrainNumber(vo.getPickupBatch()); + t.setCarNumber(vo.getCarNumber()); + t.setDriverName(vo.getDriverName()); + t.setDeliveryTime(vo.getDeliveryTime()); + t.setNum(waybillCountMap.get(waybillNumber)); + t.setSignOrderCode(vo.getPickupBatch()); + t.setType(3); + trunklineWaybillTrackClient.addSignWaybillLog(t); + + + } + + } + + + /** + * 配送签收复核 + * @param msg + */ + @RabbitListener(bindings = @QueueBinding( + value = @Queue(name = FanoutConstants.distribution.DeliveryAndrecheck.QUEUE.waybillStatusLog, durable = "true"), + exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, type = ExchangeTypes.FANOUT) + )) + @Transactional(rollbackFor = Exception.class) + public void statusDekiveryLog(String msg) { + + log.info("商/市配送 复核处理运单日志和状态: {}", msg); + if (StrUtil.isEmpty(msg)) { + return; + } + NodeFanoutMsg bean = JSONUtil.toBean(msg, NodeFanoutMsg.class); + Object main = bean.getMain(); + JSONObject entries = JSONUtil.parseObj(main); + DistributionReCheckSignVO vo = JSONUtil.toBean(entries, DistributionReCheckSignVO.class); + Long warehouseId = bean.getWarehouseId(); + BizOperationEnums bizOperation = bean.getBizOperation(); + List details = vo.getPackageDataList(); + + // 按照运单号进行分组 后面的集合 按照创建时间进行排序 + Map> map = details.stream().collect(Collectors.groupingBy(PackageData::getWaybillNumber)); + // 根据运单号 统计 每个运单的数量 + Map waybillCountMap = new HashMap<>(); + + for (PackageData packageData : details) { + String waybillNumber = packageData.getWaybillNumber(); + waybillCountMap.put(waybillNumber, waybillCountMap.getOrDefault(waybillNumber, 0) + packageData.getNumber()); + } + Set strings = waybillCountMap.keySet(); + + for (String waybillNumber : strings) { + + WaybillLogDTO t = new WaybillLogDTO(); + List packageDataList = map.get(waybillNumber); + if (packageDataList != null && !packageDataList.isEmpty()) { + packageDataList.sort(Comparator.comparing(PackageData::getSignTime)); + // 获取排序第一个 + t.setSignUser(packageDataList.get(0).getSignUser()); + t.setSignTime(packageDataList.get(0).getSignTime()); + } + t.setWaybillNo(waybillNumber); + t.setWarehouseName(bean.getWarehouse()); + t.setWarehouseId(warehouseId); + + t.setTrainNumber(vo.getTrainNumber()); + t.setCarNumber(vo.getVehicleName()); + t.setDriverName(vo.getDriverName()); + t.setDeliveryTime(vo.getDeliveryTime()); + t.setNum(waybillCountMap.get(waybillNumber)); + t.setSignOrderCode(vo.getReservationCode()); + t.setType(3); + trunklineWaybillTrackClient.addSignWaybillLog(t); + + } + + } + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java index 896d9f5d4..36e3892fd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.OpenOrderDTO; import com.logpm.trunkline.dto.WaybillLogDTO; import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper; import com.logpm.trunkline.mapper.TrunklineWaybillTrackMapper; import com.logpm.trunkline.service.IOpenOrderAsyncService; import com.logpm.trunkline.service.ITrunklineWaybillOrderService; @@ -27,12 +28,13 @@ import java.util.Objects; @Service @AllArgsConstructor public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl implements ITrunklineWaybillTrackService { - private final IWarehouseWaybillClient warehouseWaybillClient; private final IOpenOrderAsyncService openOrderAsyncService; - private final ITrunklineWaybillOrderService waybillOrderService; private final ITrunklineWaybillPackageService trunklineWaybillPackageService; + private final TrunklineWaybillPackageMapper trunklineWaybillPackageMapper; + + @Override public List findWaybillLog(Long waybillId, String trackType) { return baseMapper.findWaybillLog(waybillId,trackType); @@ -59,6 +61,11 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl>>>",packageStatus+" **"); + WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); if(Objects.isNull(warehouseWaybillEntity)){ log.warn("未找到运单信息 waybillNo:{}",waybillNo); @@ -78,6 +85,7 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl