|
|
|
|
@ -1,39 +1,66 @@
|
|
|
|
|
package com.logpm.statistics.service.impl; |
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
|
|
import cn.hutool.core.util.NumberUtil; |
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
|
import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataCodeClient; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataPriceClient; |
|
|
|
|
import com.logpm.basicdata.vo.BasicdatPriceApiVO; |
|
|
|
|
import com.logpm.basicdata.vo.PriceClientVO; |
|
|
|
|
import com.logpm.basicdata.vo.PriceDispatchBasicVO; |
|
|
|
|
import com.logpm.basicdata.vo.PriceDispatchVO; |
|
|
|
|
import com.logpm.basicdata.vo.PriceWarehouseAdditionalVO; |
|
|
|
|
import com.logpm.basicdata.vo.PriceWarehouseBasicVO; |
|
|
|
|
import com.logpm.basicdata.vo.PriceWarehouseVO; |
|
|
|
|
import com.logpm.statistics.dto.ChangesRecordDTO; |
|
|
|
|
import com.logpm.statistics.dto.MerchantStatisticsDTO; |
|
|
|
|
import com.logpm.statistics.entity.StatisticsBalanceOrderInfoEntity; |
|
|
|
|
import com.logpm.statistics.entity.StatisticsChangesPhotoEntity; |
|
|
|
|
import com.logpm.statistics.entity.StatisticsChangesRecordEntity; |
|
|
|
|
import com.logpm.statistics.entity.StatisticsDistributionPackageEntity; |
|
|
|
|
import com.logpm.statistics.entity.StatisticsOrderInfoEntity; |
|
|
|
|
import com.logpm.statistics.entity.StatisticsWarehousePackageEntity; |
|
|
|
|
import com.logpm.statistics.mapper.StatisticsOrderInfoMapper; |
|
|
|
|
import com.logpm.statistics.service.IStatisticsBalanceOrderInfoService; |
|
|
|
|
import com.logpm.statistics.service.IStatisticsChangesPhotoService; |
|
|
|
|
import com.logpm.statistics.service.IStatisticsChangesRecordService; |
|
|
|
|
import com.logpm.statistics.service.IStatisticsDistributionPackageService; |
|
|
|
|
import com.logpm.statistics.service.IStatisticsOrderInfoService; |
|
|
|
|
import com.logpm.statistics.service.IStatisticsWarehousePackageService; |
|
|
|
|
import com.logpm.statistics.vo.StatisticsChangesRecordVO; |
|
|
|
|
import com.logpm.statistics.vo.StatisticsOrderInfoVO; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.common.constant.CodeNumConstant; |
|
|
|
|
import org.springblade.common.constant.DictBizConstant; |
|
|
|
|
import org.springblade.common.enums.BooleanZeroOneEnums; |
|
|
|
|
import org.springblade.common.exception.CustomerException; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.BeanUtil; |
|
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
|
import org.springblade.system.cache.DictBizCache; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Collections; |
|
|
|
|
import java.util.Comparator; |
|
|
|
|
import java.util.Date; |
|
|
|
|
import java.util.HashSet; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.Objects; |
|
|
|
|
import java.util.Set; |
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
import java.util.concurrent.atomic.AtomicReference; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
@ -46,18 +73,21 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
private final IStatisticsChangesPhotoService changesPhotoService; |
|
|
|
|
private final IBasicdataCodeClient basicdataCodeClient; |
|
|
|
|
private final IStatisticsBalanceOrderInfoService balanceOrderInfoService; |
|
|
|
|
private final IBasicdataPriceClient priceClient; |
|
|
|
|
private final IStatisticsDistributionPackageService distributionPackageService; |
|
|
|
|
private final IStatisticsWarehousePackageService warehousePackageService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public List<StatisticsOrderInfoEntity> findListByWaybillId(Long waybillId) { |
|
|
|
|
QueryWrapper<StatisticsOrderInfoEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("waybill_id",waybillId); |
|
|
|
|
queryWrapper.eq("waybill_id", waybillId); |
|
|
|
|
return baseMapper.selectList(queryWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public List<StatisticsOrderInfoEntity> findListByOrderInfoIdsSet(Set<Long> orderInfoSet) { |
|
|
|
|
QueryWrapper<StatisticsOrderInfoEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.in("id",orderInfoSet); |
|
|
|
|
queryWrapper.in("id", orderInfoSet); |
|
|
|
|
return baseMapper.selectList(queryWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -69,7 +99,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
page.setCurrent(merchantStatisticsDTO.getPageNum()); |
|
|
|
|
page.setSize(merchantStatisticsDTO.getPageSize()); |
|
|
|
|
|
|
|
|
|
return baseMapper.pageList(page,merchantStatisticsDTO); |
|
|
|
|
return baseMapper.pageList(page, merchantStatisticsDTO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -77,22 +107,22 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
Long orderInfoId = merchantStatisticsDTO.getOrderInfoId(); |
|
|
|
|
|
|
|
|
|
QueryWrapper<StatisticsChangesRecordEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("order_info_id",orderInfoId); |
|
|
|
|
queryWrapper.eq("order_info_id", orderInfoId); |
|
|
|
|
|
|
|
|
|
List<StatisticsChangesRecordEntity> list = changesRecordService.list(queryWrapper); |
|
|
|
|
|
|
|
|
|
if(list.isEmpty()){ |
|
|
|
|
if (list.isEmpty()) { |
|
|
|
|
return CollUtil.newArrayList(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//获取list中所有元素的id
|
|
|
|
|
// 获取list中所有元素的id
|
|
|
|
|
List<Long> changesRecordIdList = list.stream().map(StatisticsChangesRecordEntity::getId).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
QueryWrapper<StatisticsChangesPhotoEntity> changesPhotoEntityQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
changesPhotoEntityQueryWrapper.in("changes_record_id",changesRecordIdList); |
|
|
|
|
changesPhotoEntityQueryWrapper.in("changes_record_id", changesRecordIdList); |
|
|
|
|
|
|
|
|
|
List<StatisticsChangesPhotoEntity> changesPhotoEntityList = changesPhotoService.list(changesPhotoEntityQueryWrapper); |
|
|
|
|
//把changesPhotoEntityList中的元素通过changesRecordId为key进行分组
|
|
|
|
|
// 把changesPhotoEntityList中的元素通过changesRecordId为key进行分组
|
|
|
|
|
Map<Long, List<StatisticsChangesPhotoEntity>> groupedEntities = |
|
|
|
|
changesPhotoEntityList.stream() |
|
|
|
|
.collect(Collectors.groupingBy(StatisticsChangesPhotoEntity::getChangesRecordId)); |
|
|
|
|
@ -100,7 +130,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
List<StatisticsChangesRecordVO> ls = new ArrayList<>(); |
|
|
|
|
list.forEach(statisticsChangesRecordEntity -> { |
|
|
|
|
StatisticsChangesRecordVO statisticsChangesRecordVO = new StatisticsChangesRecordVO(); |
|
|
|
|
BeanUtil.copy(statisticsChangesRecordEntity,statisticsChangesRecordVO); |
|
|
|
|
BeanUtil.copy(statisticsChangesRecordEntity, statisticsChangesRecordVO); |
|
|
|
|
List<StatisticsChangesPhotoEntity> statisticsChangesPhotoEntities = groupedEntities.get(statisticsChangesRecordEntity.getId()); |
|
|
|
|
statisticsChangesRecordVO.setChangesPhotoEntityList(statisticsChangesPhotoEntities); |
|
|
|
|
ls.add(statisticsChangesRecordVO); |
|
|
|
|
@ -111,7 +141,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
@Override |
|
|
|
|
public R addChangesRecord(ChangesRecordDTO changesRecordDTO) { |
|
|
|
|
StatisticsChangesRecordEntity changesRecordEntity = new StatisticsChangesRecordEntity(); |
|
|
|
|
BeanUtil.copy(changesRecordDTO,changesRecordEntity); |
|
|
|
|
BeanUtil.copy(changesRecordDTO, changesRecordEntity); |
|
|
|
|
|
|
|
|
|
String itemRecord = verifyValue(changesRecordEntity); |
|
|
|
|
|
|
|
|
|
@ -131,10 +161,10 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
}); |
|
|
|
|
changesPhotoService.saveBatch(saveList); |
|
|
|
|
|
|
|
|
|
//把changesRecordEntity对象中的所有BigDecimal类型属性的值求和
|
|
|
|
|
// 把changesRecordEntity对象中的所有BigDecimal类型属性的值求和
|
|
|
|
|
Long orderInfoId = changesRecordEntity.getOrderInfoId(); |
|
|
|
|
|
|
|
|
|
//重新计算订单的异动金额
|
|
|
|
|
// 重新计算订单的异动金额
|
|
|
|
|
updateOrderChangesFee(orderInfoId); |
|
|
|
|
|
|
|
|
|
return R.success("新增成功"); |
|
|
|
|
@ -145,7 +175,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
public R checkBalance(MerchantStatisticsDTO merchantStatisticsDTO) { |
|
|
|
|
List<Long> orderInfoIds = merchantStatisticsDTO.getOrderInfoIds(); |
|
|
|
|
|
|
|
|
|
//查询对应订单的数据
|
|
|
|
|
// 查询对应订单的数据
|
|
|
|
|
List<StatisticsOrderInfoVO> list = baseMapper.findStatementListByOrderInfoIds(orderInfoIds); |
|
|
|
|
|
|
|
|
|
Set<String> brands = new HashSet<>(); |
|
|
|
|
@ -167,60 +197,59 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
Set<String> destinationWarehouseNames = new HashSet<>(); |
|
|
|
|
Set<String> payTypes = new HashSet<>(); |
|
|
|
|
Set<String> payWays = new HashSet<>(); |
|
|
|
|
AtomicReference<Integer> totalCount = new AtomicReference<>(0);//总数量
|
|
|
|
|
AtomicReference<Integer> totalCount = new AtomicReference<>(0);// 总数量
|
|
|
|
|
|
|
|
|
|
List<BigDecimal> totalWeights = new ArrayList<>();//总重量
|
|
|
|
|
List<BigDecimal> totalVolumes = new ArrayList();//总体积
|
|
|
|
|
List<BigDecimal> totalWeights = new ArrayList<>();// 总重量
|
|
|
|
|
List<BigDecimal> totalVolumes = new ArrayList();// 总体积
|
|
|
|
|
List<BigDecimal> totalFees = new ArrayList(); |
|
|
|
|
List<BigDecimal> openFees = new ArrayList(); |
|
|
|
|
List<BigDecimal> pickupFees = new ArrayList();//提货费
|
|
|
|
|
List<BigDecimal> freightFees = new ArrayList();//运费
|
|
|
|
|
List<BigDecimal> warehouseServiceFees = new ArrayList();//仓库服务费
|
|
|
|
|
List<BigDecimal> warehouseFees = new ArrayList();//仓储费
|
|
|
|
|
List<BigDecimal> warehouseManageFees = new ArrayList();//仓储管理费
|
|
|
|
|
List<BigDecimal> warehouseSortingFees = new ArrayList();//仓储分拣费
|
|
|
|
|
List<BigDecimal> warehouseOperatingFees = new ArrayList();//仓储操作费
|
|
|
|
|
|
|
|
|
|
List<BigDecimal> deliveryServiceFees = new ArrayList();//配送服务费
|
|
|
|
|
List<BigDecimal> deliveryFees = new ArrayList();//配送费
|
|
|
|
|
List<BigDecimal> deliveryLoadingFees = new ArrayList();//配送装卸费
|
|
|
|
|
List<BigDecimal> deliverySortingFees = new ArrayList();//配送分拣费
|
|
|
|
|
List<BigDecimal> deliveryUpfloorFees = new ArrayList();//配送上楼费
|
|
|
|
|
List<BigDecimal> deliveryMoveFees = new ArrayList();//配送平移费
|
|
|
|
|
List<BigDecimal> deliveryCrossingFees = new ArrayList();//超区费
|
|
|
|
|
|
|
|
|
|
List<BigDecimal> installFees = new ArrayList();//安装费
|
|
|
|
|
List<BigDecimal> quotationFees = new ArrayList();//保价费
|
|
|
|
|
List<BigDecimal> claimingValues = new ArrayList();//申明价值
|
|
|
|
|
List<BigDecimal> otherFees = new ArrayList();//其他费
|
|
|
|
|
List<BigDecimal> returnFees = new ArrayList();//回扣
|
|
|
|
|
List<BigDecimal> thirdOprationFees = new ArrayList();//三方操作费
|
|
|
|
|
List<BigDecimal> xPays = new ArrayList();//现付
|
|
|
|
|
List<BigDecimal> dPays = new ArrayList();//到付
|
|
|
|
|
List<BigDecimal> hPays = new ArrayList();//回付
|
|
|
|
|
List<BigDecimal> yPays = new ArrayList();//月结
|
|
|
|
|
|
|
|
|
|
List<BigDecimal> pickupFees = new ArrayList();// 提货费
|
|
|
|
|
List<BigDecimal> freightFees = new ArrayList();// 运费
|
|
|
|
|
List<BigDecimal> warehouseServiceFees = new ArrayList();// 仓库服务费
|
|
|
|
|
List<BigDecimal> warehouseFees = new ArrayList();// 仓储费
|
|
|
|
|
List<BigDecimal> warehouseManageFees = new ArrayList();// 仓储管理费
|
|
|
|
|
List<BigDecimal> warehouseSortingFees = new ArrayList();// 仓储分拣费
|
|
|
|
|
List<BigDecimal> warehouseOperatingFees = new ArrayList();// 仓储操作费
|
|
|
|
|
|
|
|
|
|
List<BigDecimal> deliveryServiceFees = new ArrayList();// 配送服务费
|
|
|
|
|
List<BigDecimal> deliveryFees = new ArrayList();// 配送费
|
|
|
|
|
List<BigDecimal> deliveryLoadingFees = new ArrayList();// 配送装卸费
|
|
|
|
|
List<BigDecimal> deliverySortingFees = new ArrayList();// 配送分拣费
|
|
|
|
|
List<BigDecimal> deliveryUpfloorFees = new ArrayList();// 配送上楼费
|
|
|
|
|
List<BigDecimal> deliveryMoveFees = new ArrayList();// 配送平移费
|
|
|
|
|
List<BigDecimal> deliveryCrossingFees = new ArrayList();// 超区费
|
|
|
|
|
|
|
|
|
|
List<BigDecimal> installFees = new ArrayList();// 安装费
|
|
|
|
|
List<BigDecimal> quotationFees = new ArrayList();// 保价费
|
|
|
|
|
List<BigDecimal> claimingValues = new ArrayList();// 申明价值
|
|
|
|
|
List<BigDecimal> otherFees = new ArrayList();// 其他费
|
|
|
|
|
List<BigDecimal> returnFees = new ArrayList();// 回扣
|
|
|
|
|
List<BigDecimal> thirdOprationFees = new ArrayList();// 三方操作费
|
|
|
|
|
List<BigDecimal> xPays = new ArrayList();// 现付
|
|
|
|
|
List<BigDecimal> dPays = new ArrayList();// 到付
|
|
|
|
|
List<BigDecimal> hPays = new ArrayList();// 回付
|
|
|
|
|
List<BigDecimal> yPays = new ArrayList();// 月结
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
list.forEach(statisticsOrderInfoVO -> { |
|
|
|
|
Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId(); |
|
|
|
|
Integer confirmStatisticsOrder = statisticsOrderInfoVO.getConfirmStatisticsOrder(); |
|
|
|
|
if(confirmStatisticsOrder.equals(1)){ |
|
|
|
|
log.warn("############checkBalance: 订单id={} 已经确认对账",orderInfoId); |
|
|
|
|
throw new CustomerException(405,"存在已经确认对账的订单"); |
|
|
|
|
if (confirmStatisticsOrder.equals(1)) { |
|
|
|
|
log.warn("############checkBalance: 订单id={} 已经确认对账", orderInfoId); |
|
|
|
|
throw new CustomerException(405, "存在已经确认对账的订单"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
brands.add(statisticsOrderInfoVO.getBrand()); |
|
|
|
|
waybillNos.add(statisticsOrderInfoVO.getWaybillNo()); |
|
|
|
|
orderCodes.add(statisticsOrderInfoVO.getOrderNo()); |
|
|
|
|
typeServices.add(DictBizCache.getValue(DictBizConstant.BASIC_FREIGHT_TYPE,statisticsOrderInfoVO.getTypeService())); |
|
|
|
|
typeServices.add(DictBizCache.getValue(DictBizConstant.BASIC_FREIGHT_TYPE, statisticsOrderInfoVO.getTypeService())); |
|
|
|
|
String goodsName = statisticsOrderInfoVO.getGoodsName(); |
|
|
|
|
if(goodsName.contains(",")){ |
|
|
|
|
if (goodsName.contains(",")) { |
|
|
|
|
String[] split = goodsName.split(","); |
|
|
|
|
for (int i = 0; i < split.length; i++) { |
|
|
|
|
productGoods.add(split[i]); |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
} else { |
|
|
|
|
productGoods.add(goodsName); |
|
|
|
|
} |
|
|
|
|
shippers.add(statisticsOrderInfoVO.getShipper()); |
|
|
|
|
@ -271,66 +300,66 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
//对totalWeights进行求和
|
|
|
|
|
// 对totalWeights进行求和
|
|
|
|
|
BigDecimal totalWeight = totalWeights.stream().reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
BigDecimal totalVolume = totalVolumes.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//总体积
|
|
|
|
|
BigDecimal totalBalanceFee = totalFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//结算总金额 TODO 这里还需要加上售后的单子金额
|
|
|
|
|
BigDecimal totalVolume = totalVolumes.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 总体积
|
|
|
|
|
BigDecimal totalBalanceFee = totalFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 结算总金额 TODO 这里还需要加上售后的单子金额
|
|
|
|
|
BigDecimal totalFee = totalFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
BigDecimal openFee = openFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
BigDecimal pickupFee = pickupFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//提货费
|
|
|
|
|
BigDecimal freightFee = freightFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//运费
|
|
|
|
|
BigDecimal warehouseServiceFee = warehouseServiceFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//仓库服务费
|
|
|
|
|
BigDecimal warehouseFee = warehouseFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//仓储费
|
|
|
|
|
BigDecimal warehouseManageFee = warehouseManageFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//仓储管理费
|
|
|
|
|
BigDecimal warehouseSortingFee = warehouseSortingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//仓储分拣费
|
|
|
|
|
BigDecimal warehouseOperatingFee = warehouseOperatingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//仓储操作费
|
|
|
|
|
|
|
|
|
|
BigDecimal deliveryServiceFee = deliveryServiceFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//配送服务费
|
|
|
|
|
BigDecimal deliveryFee = deliveryFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//配送费
|
|
|
|
|
BigDecimal deliveryLoadingFee = deliveryLoadingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//配送装卸费
|
|
|
|
|
BigDecimal deliverySortingFee = deliverySortingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//配送分拣费
|
|
|
|
|
BigDecimal deliveryUpfloorFee = deliveryUpfloorFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//配送上楼费
|
|
|
|
|
BigDecimal deliveryMoveFee = deliveryMoveFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//配送平移费
|
|
|
|
|
BigDecimal deliveryCrossingFee = deliveryCrossingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//超区费
|
|
|
|
|
|
|
|
|
|
BigDecimal installFee = installFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//安装费
|
|
|
|
|
BigDecimal quotationFee = quotationFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//保价费
|
|
|
|
|
BigDecimal claimingValue = claimingValues.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//申明价值
|
|
|
|
|
BigDecimal otherFee = otherFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//其他费
|
|
|
|
|
BigDecimal returnFee = returnFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//回扣
|
|
|
|
|
BigDecimal thirdOprationFee = thirdOprationFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//三方操作费
|
|
|
|
|
BigDecimal xPay = xPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//现付
|
|
|
|
|
BigDecimal dPay = dPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//到付
|
|
|
|
|
BigDecimal hPay = hPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//回付
|
|
|
|
|
BigDecimal yPay = yPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);//月结
|
|
|
|
|
BigDecimal pickupFee = pickupFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 提货费
|
|
|
|
|
BigDecimal freightFee = freightFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 运费
|
|
|
|
|
BigDecimal warehouseServiceFee = warehouseServiceFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 仓库服务费
|
|
|
|
|
BigDecimal warehouseFee = warehouseFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 仓储费
|
|
|
|
|
BigDecimal warehouseManageFee = warehouseManageFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 仓储管理费
|
|
|
|
|
BigDecimal warehouseSortingFee = warehouseSortingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 仓储分拣费
|
|
|
|
|
BigDecimal warehouseOperatingFee = warehouseOperatingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 仓储操作费
|
|
|
|
|
|
|
|
|
|
BigDecimal deliveryServiceFee = deliveryServiceFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 配送服务费
|
|
|
|
|
BigDecimal deliveryFee = deliveryFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 配送费
|
|
|
|
|
BigDecimal deliveryLoadingFee = deliveryLoadingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 配送装卸费
|
|
|
|
|
BigDecimal deliverySortingFee = deliverySortingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 配送分拣费
|
|
|
|
|
BigDecimal deliveryUpfloorFee = deliveryUpfloorFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 配送上楼费
|
|
|
|
|
BigDecimal deliveryMoveFee = deliveryMoveFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 配送平移费
|
|
|
|
|
BigDecimal deliveryCrossingFee = deliveryCrossingFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 超区费
|
|
|
|
|
|
|
|
|
|
BigDecimal installFee = installFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 安装费
|
|
|
|
|
BigDecimal quotationFee = quotationFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 保价费
|
|
|
|
|
BigDecimal claimingValue = claimingValues.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 申明价值
|
|
|
|
|
BigDecimal otherFee = otherFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 其他费
|
|
|
|
|
BigDecimal returnFee = returnFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 回扣
|
|
|
|
|
BigDecimal thirdOprationFee = thirdOprationFees.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 三方操作费
|
|
|
|
|
BigDecimal xPay = xPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 现付
|
|
|
|
|
BigDecimal dPay = dPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 到付
|
|
|
|
|
BigDecimal hPay = hPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 回付
|
|
|
|
|
BigDecimal yPay = yPays.stream().reduce(BigDecimal.ZERO, BigDecimal::add);// 月结
|
|
|
|
|
|
|
|
|
|
StatisticsBalanceOrderInfoEntity statisticsBalanceOrderInfoEntity = new StatisticsBalanceOrderInfoEntity(); |
|
|
|
|
|
|
|
|
|
String balanceOrder = basicdataCodeClient.getCodeByType(CodeNumConstant.BALANCE_ORDER, "BALANCE_ORDER", ""); |
|
|
|
|
|
|
|
|
|
statisticsBalanceOrderInfoEntity.setBalanceOrderNo(balanceOrder); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setBrand(String.join(",",brands)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setWaybillNo(String.join(",",waybillNos)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setOrderCode(String.join(",",orderCodes)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setTypeService(String.join(",",typeServices)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setProductGoods(String.join(",",productGoods)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setBrand(String.join(",", brands)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setWaybillNo(String.join(",", waybillNos)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setOrderCode(String.join(",", orderCodes)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setTypeService(String.join(",", typeServices)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setProductGoods(String.join(",", productGoods)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setTotalCount(totalCount.get()); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setTotalWeight(totalWeight); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setTotalVolume(totalVolume); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipper(String.join(",",shippers)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipperPerson(String.join(",",shipperPersons)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipperMobile(String.join(",",shipperMobiles)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipperAddress(String.join(",",shipperAddresses)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsignee(String.join(",",consignees)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsigneePerson(String.join(",",consigneePersons)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsigneeMobile(String.join(",",consigneeMobiles)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsigneeAddress(String.join(",",consigneeAddresses)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDeparture(String.join(",",departures)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDestination(String.join(",",destinations)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDepartureWarehouseName(String.join(",",departureWarehouseNames)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDestinationWarehouseName(String.join(",",destinationWarehouseNames)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setPayType(String.join(",",payTypes)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setPayWay(String.join(",",payWays)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipper(String.join(",", shippers)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipperPerson(String.join(",", shipperPersons)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipperMobile(String.join(",", shipperMobiles)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setShipperAddress(String.join(",", shipperAddresses)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsignee(String.join(",", consignees)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsigneePerson(String.join(",", consigneePersons)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsigneeMobile(String.join(",", consigneeMobiles)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setConsigneeAddress(String.join(",", consigneeAddresses)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDeparture(String.join(",", departures)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDestination(String.join(",", destinations)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDepartureWarehouseName(String.join(",", departureWarehouseNames)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setDestinationWarehouseName(String.join(",", destinationWarehouseNames)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setPayType(String.join(",", payTypes)); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setPayWay(String.join(",", payWays)); |
|
|
|
|
|
|
|
|
|
statisticsBalanceOrderInfoEntity.setIsAftersale(0); |
|
|
|
|
statisticsBalanceOrderInfoEntity.setAftersalesFee(BigDecimal.ZERO); |
|
|
|
|
@ -370,7 +399,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
|
|
|
|
|
balanceOrderInfoService.save(statisticsBalanceOrderInfoEntity); |
|
|
|
|
|
|
|
|
|
//订单的结算单号生成
|
|
|
|
|
// 订单的结算单号生成
|
|
|
|
|
List<StatisticsOrderInfoEntity> statisticsOrderInfoEntities = baseMapper.selectList(new QueryWrapper<StatisticsOrderInfoEntity>().lambda().in(StatisticsOrderInfoEntity::getId, orderInfoIds)); |
|
|
|
|
statisticsOrderInfoEntities.forEach(statisticsOrderInfoEntity -> { |
|
|
|
|
statisticsOrderInfoEntity.setBalanceOrderNo(statisticsBalanceOrderInfoEntity.getBalanceOrderNo()); |
|
|
|
|
@ -393,12 +422,449 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
return statementListByOrderInfoIds.get(0); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public boolean calculateRealCost(Long id) { |
|
|
|
|
StatisticsOrderInfoEntity orderInfoEntity = this.getOne(new QueryWrapper<StatisticsOrderInfoEntity>().lambda().eq(StatisticsOrderInfoEntity::getId, id)); |
|
|
|
|
if (ObjectUtil.isEmpty(orderInfoEntity)) { |
|
|
|
|
log.warn("#############calculateRealCost: 订单信息不存在"); |
|
|
|
|
throw new CustomerException("订单信息不存在"); |
|
|
|
|
} |
|
|
|
|
Long brandId = orderInfoEntity.getBrandId(); |
|
|
|
|
Long consigneeId = orderInfoEntity.getConsigneeId(); |
|
|
|
|
if (!ObjectUtil.isAllNotEmpty(brandId, consigneeId)) { |
|
|
|
|
log.warn("#############calculateRealCost: 品牌{} 收货单位{}", brandId, consigneeId); |
|
|
|
|
throw new CustomerException("结算单信息不完整，缺少品牌和收货单位，请联系系统管理员。"); |
|
|
|
|
} |
|
|
|
|
Date createTime = orderInfoEntity.getCreateTime(); |
|
|
|
|
// 根据 品牌 收货单位 开单时间 获取价格体系
|
|
|
|
|
PriceClientVO price = priceClient.price(BasicdatPriceApiVO.builder() |
|
|
|
|
.clientId(consigneeId.toString()) |
|
|
|
|
.brandId(brandId.toString()) |
|
|
|
|
.time(DateUtil.formatTime(createTime)) |
|
|
|
|
.build()); |
|
|
|
|
if (ObjectUtil.isEmpty(price)) { |
|
|
|
|
log.warn("#############calculateRealCost: 未维护价格，无法计算。"); |
|
|
|
|
throw new CustomerException("未维护价格，无法计算。"); |
|
|
|
|
} |
|
|
|
|
// 查询包件数据
|
|
|
|
|
List<StatisticsDistributionPackageEntity> distributionPackageEntities = distributionPackageService.list(new QueryWrapper<StatisticsDistributionPackageEntity>().lambda().eq(StatisticsDistributionPackageEntity::getOrderInfoId, id)); |
|
|
|
|
// 校验是否全部配送完成
|
|
|
|
|
if (distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == 0)) { |
|
|
|
|
log.warn("#############calculateRealCost: 订单未全部配送完成，无法计算。"); |
|
|
|
|
throw new CustomerException("订单未全部配送完成，无法计算。"); |
|
|
|
|
} |
|
|
|
|
List<StatisticsWarehousePackageEntity> warehousePackageEntities = warehousePackageService.list(new QueryWrapper<StatisticsWarehousePackageEntity>().lambda().eq(StatisticsWarehousePackageEntity::getOrderInfoId, id)); |
|
|
|
|
PriceDispatchVO dispatch = price.getDispatch(); |
|
|
|
|
PriceWarehouseVO warehouse = price.getWarehouse(); |
|
|
|
|
|
|
|
|
|
BasicdataPriceTemplateEntity template = price.getTemplate(); |
|
|
|
|
if (ObjectUtil.isEmpty(template)) { |
|
|
|
|
log.warn("#############calculateRealCost: 未维护模版，无法计算。"); |
|
|
|
|
throw new CustomerException("未维护模版，无法计算。"); |
|
|
|
|
} |
|
|
|
|
String serviceType = template.getServiceType(); |
|
|
|
|
Integer dispatchIsMinCost = template.getDispatchIsMinCost(); |
|
|
|
|
|
|
|
|
|
// 模版的服务类型
|
|
|
|
|
String typeService = orderInfoEntity.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); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return Boolean.TRUE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void calculateWarehouseCost(PriceWarehouseVO warehouse, List<StatisticsWarehousePackageEntity> warehousePackageEntities, BasicdataPriceTemplateEntity template) { |
|
|
|
|
if (ObjectUtil.isNotEmpty(warehouse)) { |
|
|
|
|
// 取出 warehousePackageEntities 中的最小的入库时间 warehouseEntryTimeEnd 和最大的签收时间 signTime。两个时间相差的天数为在库周期
|
|
|
|
|
// 过滤掉无用无用数据
|
|
|
|
|
warehousePackageEntities.removeIf(entity -> entity.getWarehouseEntryTimeEnd() == null || entity.getSignTime() == null); |
|
|
|
|
Long diff = null; |
|
|
|
|
if (CollUtil.isNotEmpty(warehousePackageEntities)) { |
|
|
|
|
// 找到最早的入库结束时间和最晚的签收时间
|
|
|
|
|
StatisticsWarehousePackageEntity earliestEntity = Collections.min(warehousePackageEntities, Comparator.comparing(StatisticsWarehousePackageEntity::getWarehouseEntryTimeEnd)); |
|
|
|
|
StatisticsWarehousePackageEntity latestEntity = Collections.max(warehousePackageEntities, Comparator.comparing(StatisticsWarehousePackageEntity::getSignTime)); |
|
|
|
|
Date warehouseEntryTimeEnd = earliestEntity.getWarehouseEntryTimeEnd(); |
|
|
|
|
Date signTime = latestEntity.getSignTime(); |
|
|
|
|
// 计算在库周期（相差天数）
|
|
|
|
|
long diffInMillies = Math.abs(signTime.getTime() - warehouseEntryTimeEnd.getTime()); |
|
|
|
|
diff = (diffInMillies + TimeUnit.DAYS.toMillis(1) - 1) / TimeUnit.DAYS.toMillis(1); |
|
|
|
|
} |
|
|
|
|
if (diff != null && diff > 0) { |
|
|
|
|
for (StatisticsWarehousePackageEntity warehousePackageEntity : warehousePackageEntities) { |
|
|
|
|
buildBasicWarehouseCost(warehousePackageEntity, warehouse, template, diff); |
|
|
|
|
} |
|
|
|
|
if (CollUtil.isNotEmpty(warehousePackageEntities)) { |
|
|
|
|
// 计算配送服务费 realDeliveryServiceFee = 所有real费用的和
|
|
|
|
|
warehousePackageEntities.stream().forEach(entity -> { |
|
|
|
|
entity.setRealWarehouseServiceFee(entity.getRealWarehouseFee() |
|
|
|
|
.add(entity.getRealWarehouseManageFee()) |
|
|
|
|
.add(entity.getRealWarehouseSortingFee()) |
|
|
|
|
.add(entity.getRealWarehouseOperatingFee()) |
|
|
|
|
); |
|
|
|
|
}); |
|
|
|
|
warehousePackageService.updateBatchById(warehousePackageEntities); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void calculateDispatchCost(BasicdataPriceTemplateEntity template, String typeService, List<StatisticsDistributionPackageEntity> distributionPackageEntities, PriceDispatchVO dispatch, Integer dispatchIsMinCost) { |
|
|
|
|
String dispatchPricingType = template.getDispatchPricingType(); |
|
|
|
|
// 服务类型与模版的服务类型一致
|
|
|
|
|
if (StrUtil.equals(dispatchPricingType, typeService)) { |
|
|
|
|
// 计算基础配送费
|
|
|
|
|
Integer dispatchIsByCategory = template.getDispatchIsByCategory(); |
|
|
|
|
if (ObjectUtil.isNotEmpty(dispatch)) { |
|
|
|
|
for (StatisticsDistributionPackageEntity statisticsDistributionPackageEntity : distributionPackageEntities) { |
|
|
|
|
buildBasicDispatchCost(statisticsDistributionPackageEntity, dispatch, dispatchIsByCategory); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 保底价
|
|
|
|
|
// 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)) { |
|
|
|
|
Map<String, List<StatisticsDistributionPackageEntity>> map = distributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getTrainNumber)); |
|
|
|
|
if (CollUtil.isNotEmpty(map)) { |
|
|
|
|
for (Map.Entry<String, List<StatisticsDistributionPackageEntity>> entry : map.entrySet()) { |
|
|
|
|
List<StatisticsDistributionPackageEntity> value = entry.getValue(); |
|
|
|
|
buildDispatchCostToPackage(dispatchMinCostType, value, minCost, additionalCost); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 保存配送包件信息
|
|
|
|
|
if (CollUtil.isNotEmpty(distributionPackageEntities)) { |
|
|
|
|
// 计算配送服务费 realDeliveryServiceFee = 所有real费用的和
|
|
|
|
|
distributionPackageEntities.stream().forEach(entity -> { |
|
|
|
|
entity.setRealDeliveryServiceFee(entity.getRealDeliveryFee() |
|
|
|
|
.add(entity.getRealDeliveryLoadingFee()) |
|
|
|
|
.add(entity.getRealDeliveryMoveFee()) |
|
|
|
|
.add(entity.getRealDeliveryCrossingFee()) |
|
|
|
|
.add(entity.getRealDeliverySortingFee()) |
|
|
|
|
.add(entity.getRealDeliveryUpfloorFee()) |
|
|
|
|
.add(entity.getRealDeliveryDistance())); |
|
|
|
|
}); |
|
|
|
|
distributionPackageService.saveOrUpdateBatch(distributionPackageEntities); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void buildBasicDispatchCost(StatisticsDistributionPackageEntity statisticsDistributionPackageEntity, PriceDispatchVO dispatch, Integer dispatchIsByCategory) { |
|
|
|
|
List<PriceDispatchBasicVO> pieceCategory = dispatch.getPieceCategory(); |
|
|
|
|
if (CollUtil.isNotEmpty(pieceCategory)) { |
|
|
|
|
List<PriceDispatchBasicVO> pieceList = pieceCategory; |
|
|
|
|
if (1 == dispatchIsByCategory) { |
|
|
|
|
pieceList = pieceCategory.stream().filter(priceDispatchBasicVO -> { |
|
|
|
|
return StrUtil.equals(String.valueOf(priceDispatchBasicVO.getCategoryId()), statisticsDistributionPackageEntity.getProductId()); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
if (CollUtil.isNotEmpty(pieceList)) { |
|
|
|
|
PriceDispatchBasicVO priceDispatchBasicVO = pieceList.get(0); |
|
|
|
|
// TODO 如果是遗留件 按遗留件单价来计算 目前只有欧派有遗留件
|
|
|
|
|
Double price1 = priceDispatchBasicVO.getPrice(); |
|
|
|
|
// 配送费 = 按件单价
|
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(NumberUtil.toBigDecimal(price1)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<PriceDispatchBasicVO> cubeCategory = dispatch.getCubeCategory(); |
|
|
|
|
if (CollUtil.isNotEmpty(cubeCategory)) { |
|
|
|
|
List<PriceDispatchBasicVO> cubeList = cubeCategory; |
|
|
|
|
if (1 == dispatchIsByCategory) { |
|
|
|
|
cubeList = cubeCategory.stream().filter(priceDispatchBasicVO -> { |
|
|
|
|
return StrUtil.equals(String.valueOf(priceDispatchBasicVO.getCategoryId()), statisticsDistributionPackageEntity.getProductId()); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
if (CollUtil.isNotEmpty(cubeList)) { |
|
|
|
|
PriceDispatchBasicVO priceDispatchBasicVO = cubeList.get(0); |
|
|
|
|
// TODO 如果是遗留件 按遗留件单价来计算 目前只有欧派有遗留件
|
|
|
|
|
Double price1 = priceDispatchBasicVO.getPrice(); |
|
|
|
|
BigDecimal totalVolume = statisticsDistributionPackageEntity.getTotalVolume(); |
|
|
|
|
// 配送费 = 按方单价 * 体积
|
|
|
|
|
if (ObjectUtil.isNotEmpty(totalVolume)) { |
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(NumberUtil.toBigDecimal(price1).multiply(totalVolume)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<PriceDispatchBasicVO> weightCategory = dispatch.getWeightCategory(); |
|
|
|
|
if (CollUtil.isNotEmpty(weightCategory)) { |
|
|
|
|
List<PriceDispatchBasicVO> weightList = weightCategory; |
|
|
|
|
if (1 == dispatchIsByCategory) { |
|
|
|
|
weightList = weightCategory.stream().filter(priceDispatchBasicVO -> { |
|
|
|
|
return StrUtil.equals(String.valueOf(priceDispatchBasicVO.getCategoryId()), statisticsDistributionPackageEntity.getProductId()); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
if (CollUtil.isNotEmpty(weightList)) { |
|
|
|
|
PriceDispatchBasicVO priceDispatchBasicVO = weightList.get(0); |
|
|
|
|
// TODO 如果是遗留件 按遗留件单价来计算 目前只有欧派有遗留件
|
|
|
|
|
Double price1 = priceDispatchBasicVO.getPrice(); |
|
|
|
|
BigDecimal totalWeight = statisticsDistributionPackageEntity.getTotalWeight(); |
|
|
|
|
// 配送费 = 按重量单价 * 重量
|
|
|
|
|
if (ObjectUtil.isNotEmpty(totalWeight)) { |
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(NumberUtil.toBigDecimal(price1).multiply(totalWeight)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void buildBasicWarehouseCost(StatisticsWarehousePackageEntity statisticsDistributionPackageEntity, PriceWarehouseVO warehouseVO, BasicdataPriceTemplateEntity template, Long diff) { |
|
|
|
|
// 1 按件 2 按方 3 按重量
|
|
|
|
|
Integer warehousePricingType = template.getWarehousePricingType(); |
|
|
|
|
// 1 分段式 2 最高标准
|
|
|
|
|
Integer warehousePricingMode = template.getWarehousePricingMode(); |
|
|
|
|
// 计费标准 1 按件/天 2 按件/月
|
|
|
|
|
Integer warehouseCalculationBasis = template.getWarehouseCalculationBasis(); |
|
|
|
|
if (!ObjectUtil.isAllNotEmpty(warehousePricingType, warehousePricingMode, warehouseCalculationBasis)) { |
|
|
|
|
log.warn("模版参数不全不计算"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
// 仓储费是否按品类计费 1 是 0 否
|
|
|
|
|
Integer warehouseIsByCategory = template.getWarehouseIsByCategory(); |
|
|
|
|
List<PriceWarehouseBasicVO> catergory = warehouseVO.getCatergory(); |
|
|
|
|
if (CollUtil.isNotEmpty(catergory)) { |
|
|
|
|
List<PriceWarehouseBasicVO> pieceList = catergory; |
|
|
|
|
if (1 == warehouseIsByCategory) { |
|
|
|
|
pieceList = catergory.stream().filter(priceDispatchBasicVO -> { |
|
|
|
|
return StrUtil.equals(String.valueOf(priceDispatchBasicVO.getCategoryId()), statisticsDistributionPackageEntity.getProductId()); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
if (CollUtil.isNotEmpty(pieceList)) { |
|
|
|
|
BigDecimal totalVolume = statisticsDistributionPackageEntity.getTotalVolume(); |
|
|
|
|
BigDecimal totalWeight = statisticsDistributionPackageEntity.getTotalWeight(); |
|
|
|
|
PriceWarehouseBasicVO priceDispatchBasicVO = pieceList.get(0); |
|
|
|
|
Double withinThirtyPrice = priceDispatchBasicVO.getWithinThirtyPrice(); |
|
|
|
|
Double betweenThirtySixtyPrice = priceDispatchBasicVO.getBetweenThirtySixtyPrice(); |
|
|
|
|
Double beyondSixtyPrice = priceDispatchBasicVO.getBeyondSixtyPrice(); |
|
|
|
|
Double beyondNinetyPrice = priceDispatchBasicVO.getBeyondNinetyPrice(); |
|
|
|
|
// 计算仓储费
|
|
|
|
|
if (ObjectUtil.equals(1, warehousePricingType)) { |
|
|
|
|
if (ObjectUtil.equals(1, warehousePricingMode)) { |
|
|
|
|
fenDuan(statisticsDistributionPackageEntity, diff, warehouseCalculationBasis, withinThirtyPrice, BigDecimal.ONE, betweenThirtySixtyPrice, beyondSixtyPrice, beyondNinetyPrice); |
|
|
|
|
} else if (ObjectUtil.equals(2, warehousePricingMode)) { |
|
|
|
|
zuiGao(statisticsDistributionPackageEntity, diff, warehouseCalculationBasis, withinThirtyPrice, BigDecimal.ONE, betweenThirtySixtyPrice, beyondSixtyPrice, beyondNinetyPrice); |
|
|
|
|
} |
|
|
|
|
} else if (ObjectUtil.equals(2, warehousePricingType)) { |
|
|
|
|
if (ObjectUtil.equals(1, warehousePricingMode)) { |
|
|
|
|
fenDuan(statisticsDistributionPackageEntity, diff, warehouseCalculationBasis, withinThirtyPrice, totalVolume, betweenThirtySixtyPrice, beyondSixtyPrice, beyondNinetyPrice); |
|
|
|
|
} else if (ObjectUtil.equals(2, warehousePricingMode)) { |
|
|
|
|
zuiGao(statisticsDistributionPackageEntity, diff, warehouseCalculationBasis, withinThirtyPrice, totalVolume, betweenThirtySixtyPrice, beyondSixtyPrice, beyondNinetyPrice); |
|
|
|
|
} |
|
|
|
|
} else if (ObjectUtil.equals(3, warehousePricingType)) { |
|
|
|
|
if (ObjectUtil.equals(1, warehousePricingMode)) { |
|
|
|
|
fenDuan(statisticsDistributionPackageEntity, diff, warehouseCalculationBasis, withinThirtyPrice, totalWeight, betweenThirtySixtyPrice, beyondSixtyPrice, beyondNinetyPrice); |
|
|
|
|
} else if (ObjectUtil.equals(2, warehousePricingMode)) { |
|
|
|
|
zuiGao(statisticsDistributionPackageEntity, diff, warehouseCalculationBasis, withinThirtyPrice, totalWeight, betweenThirtySixtyPrice, beyondSixtyPrice, beyondNinetyPrice); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
Integer warehouseIsAddFee = template.getWarehouseIsAddFee(); |
|
|
|
|
if (ObjectUtil.equals(BooleanZeroOneEnums.YES.getCode(), warehouseIsAddFee)) { |
|
|
|
|
// 是否有管理费
|
|
|
|
|
Integer warehouseIsManageFee = template.getWarehouseIsManageFee(); |
|
|
|
|
// 是否有分拣费
|
|
|
|
|
Integer warehouseIsSortFee = template.getWarehouseIsSortFee(); |
|
|
|
|
// 是否有操作费
|
|
|
|
|
Integer warehouseIsOperatingFee = template.getWarehouseIsOperateFee(); |
|
|
|
|
// 是否按品类附加费
|
|
|
|
|
Integer warehouseIsCategorySubjoin = template.getWarehouseIsCategorySubjoin(); |
|
|
|
|
List<PriceWarehouseAdditionalVO> additionalCategory = warehouseVO.getAdditionalCategory(); |
|
|
|
|
if (CollUtil.isNotEmpty(additionalCategory)) { |
|
|
|
|
List<PriceWarehouseAdditionalVO> additionalList = additionalCategory; |
|
|
|
|
if (ObjectUtil.equals(BooleanZeroOneEnums.YES.getCode(), warehouseIsCategorySubjoin)) { |
|
|
|
|
additionalList = additionalCategory.stream().filter(additionalVO -> { |
|
|
|
|
return StrUtil.equals(String.valueOf(additionalVO.getCategoryId()), statisticsDistributionPackageEntity.getProductId()); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
if (CollUtil.isNotEmpty(additionalList)) { |
|
|
|
|
PriceWarehouseAdditionalVO additionalVO = additionalList.get(0); |
|
|
|
|
Double operatePrice = additionalVO.getOperatePrice(); |
|
|
|
|
Double managementPrice = additionalVO.getWarehouseManagementPrice(); |
|
|
|
|
Double warehouseSortPrice = additionalVO.getWarehouseSortPrice(); |
|
|
|
|
if (ObjectUtil.equals(BooleanZeroOneEnums.YES.getCode(), warehouseIsManageFee)) { |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseManageFee(NumberUtil.toBigDecimal(managementPrice)); |
|
|
|
|
} |
|
|
|
|
if (ObjectUtil.equals(BooleanZeroOneEnums.YES.getCode(), warehouseIsSortFee)) { |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseSortingFee(NumberUtil.toBigDecimal(warehouseSortPrice)); |
|
|
|
|
} |
|
|
|
|
if (ObjectUtil.equals(BooleanZeroOneEnums.YES.getCode(), warehouseIsOperatingFee)) { |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseOperatingFee(NumberUtil.toBigDecimal(operatePrice)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static void zuiGao(StatisticsWarehousePackageEntity statisticsDistributionPackageEntity, Long diff, Integer warehouseCalculationBasis, Double withinThirtyPrice, BigDecimal number, Double betweenThirtySixtyPrice, Double beyondSixtyPrice, Double beyondNinetyPrice) { |
|
|
|
|
if (ObjectUtil.equals(1, warehouseCalculationBasis)) { |
|
|
|
|
// 方 最高 天
|
|
|
|
|
BigDecimal realWarehouseFee = BigDecimal.ZERO; |
|
|
|
|
if (diff <= 30) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(withinThirtyPrice, diff, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("30天内"); |
|
|
|
|
} else if (diff <= 60) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(betweenThirtySixtyPrice, diff, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("31-60天"); |
|
|
|
|
} else if (diff <= 90) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(beyondSixtyPrice, diff, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("61-90天"); |
|
|
|
|
} else if (diff > 90) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(beyondNinetyPrice, diff, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("91天以上"); |
|
|
|
|
} |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFee(realWarehouseFee); |
|
|
|
|
} else if (ObjectUtil.equals(2, warehouseCalculationBasis)) { |
|
|
|
|
// 方 最高 月
|
|
|
|
|
BigDecimal realWarehouseFee = BigDecimal.ZERO; |
|
|
|
|
if (diff <= 30) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(withinThirtyPrice, 1, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("30天内"); |
|
|
|
|
} else if (diff <= 60) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(betweenThirtySixtyPrice, 2, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("31-60天"); |
|
|
|
|
} else if (diff <= 90) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(beyondSixtyPrice, 3, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("61-90天"); |
|
|
|
|
} else if (diff > 90) { |
|
|
|
|
long time = diff - 90; |
|
|
|
|
// time 以 30 天为维度 计算 ，向上取整
|
|
|
|
|
Double ceil = Math.ceil(time / 30); |
|
|
|
|
realWarehouseFee = NumberUtil.mul(beyondNinetyPrice, NumberUtil.add(ceil, 3, BigDecimal.ZERO), number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("91天以上"); |
|
|
|
|
} |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFee(realWarehouseFee); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static void fenDuan(StatisticsWarehousePackageEntity statisticsDistributionPackageEntity, Long diff, Integer warehouseCalculationBasis, Double withinThirtyPrice, BigDecimal number, Double betweenThirtySixtyPrice, Double beyondSixtyPrice, Double beyondNinetyPrice) { |
|
|
|
|
if (ObjectUtil.equals(1, warehouseCalculationBasis)) { |
|
|
|
|
// 方 分段 天
|
|
|
|
|
BigDecimal realWarehouseFee = BigDecimal.ZERO; |
|
|
|
|
if (diff <= 30) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(withinThirtyPrice, diff, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("30天内"); |
|
|
|
|
} else if (diff <= 60) { |
|
|
|
|
realWarehouseFee = NumberUtil.add( |
|
|
|
|
NumberUtil.mul(withinThirtyPrice, 30, number), |
|
|
|
|
NumberUtil.mul(betweenThirtySixtyPrice, NumberUtil.sub(diff, 30, BigDecimal.ZERO), number) |
|
|
|
|
); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("31-60天"); |
|
|
|
|
} else if (diff <= 90) { |
|
|
|
|
realWarehouseFee = NumberUtil.add( |
|
|
|
|
NumberUtil.mul(withinThirtyPrice, 30, number), |
|
|
|
|
NumberUtil.mul(betweenThirtySixtyPrice, 30, number), |
|
|
|
|
NumberUtil.mul(beyondSixtyPrice, NumberUtil.sub(diff, 60, BigDecimal.ZERO), number) |
|
|
|
|
); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("61-90天"); |
|
|
|
|
} else if (diff > 90) { |
|
|
|
|
realWarehouseFee = NumberUtil.add( |
|
|
|
|
NumberUtil.mul(withinThirtyPrice, 30, number), |
|
|
|
|
NumberUtil.mul(betweenThirtySixtyPrice, 30, number), |
|
|
|
|
NumberUtil.mul(beyondSixtyPrice, 30, number), |
|
|
|
|
NumberUtil.mul(beyondNinetyPrice, NumberUtil.sub(diff, 90, BigDecimal.ZERO), number) |
|
|
|
|
); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("91天以上"); |
|
|
|
|
} |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFee(realWarehouseFee); |
|
|
|
|
} else if (ObjectUtil.equals(2, warehouseCalculationBasis)) { |
|
|
|
|
// 方 分段 月
|
|
|
|
|
BigDecimal realWarehouseFee = BigDecimal.ZERO; |
|
|
|
|
if (diff <= 30) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(withinThirtyPrice, number); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("30天内"); |
|
|
|
|
} else if (diff <= 60) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(number, NumberUtil.add(withinThirtyPrice, betweenThirtySixtyPrice, BigDecimal.ZERO)); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("31-60天"); |
|
|
|
|
} else if (diff <= 90) { |
|
|
|
|
realWarehouseFee = NumberUtil.mul(number, NumberUtil.add(withinThirtyPrice, betweenThirtySixtyPrice, beyondSixtyPrice)); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("61-90天"); |
|
|
|
|
} else if (diff > 90) { |
|
|
|
|
long time = diff - 90; |
|
|
|
|
// time 以 30 天为维度 计算 ，向上取整
|
|
|
|
|
Double ceil = Math.ceil(time / 30); |
|
|
|
|
realWarehouseFee = NumberUtil.mul(number, NumberUtil.add(withinThirtyPrice, betweenThirtySixtyPrice, beyondSixtyPrice, NumberUtil.mul(ceil, beyondNinetyPrice))); |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFeeInterval("91天以上"); |
|
|
|
|
} |
|
|
|
|
statisticsDistributionPackageEntity.setRealWarehouseFee(realWarehouseFee); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void buildDispatchCostToPackage(Integer dispatchMinCostType, List<StatisticsDistributionPackageEntity> distributionPackageEntities, Double minCost, Double additionalCost) { |
|
|
|
|
if (ObjectUtil.equals(1, dispatchMinCostType)) { |
|
|
|
|
// 计算总价
|
|
|
|
|
BigDecimal sumDeliveryFee = distributionPackageEntities.stream().map(StatisticsDistributionPackageEntity::getRealDeliveryFee).reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
// 总价和最低价 取大的值
|
|
|
|
|
BigDecimal max = NumberUtil.max(sumDeliveryFee, NumberUtil.toBigDecimal(minCost)); |
|
|
|
|
// 分摊价格个到包件上
|
|
|
|
|
// max - sumDeliveryFee 大于 0 则分摊价格个到包件上
|
|
|
|
|
if (max.compareTo(sumDeliveryFee) > 0) { |
|
|
|
|
// 分摊价格个到包件上 (原单价 + (max - sumDeliveryFee)/件数)
|
|
|
|
|
BigDecimal divide = max.subtract(sumDeliveryFee).divide(NumberUtil.toBigDecimal(distributionPackageEntities.size()), 2, BigDecimal.ROUND_HALF_UP); |
|
|
|
|
distributionPackageEntities.forEach(statisticsDistributionPackageEntity -> { |
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(statisticsDistributionPackageEntity.getRealDeliveryFee().add(divide)); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} else if (ObjectUtil.equals(2, dispatchMinCostType)) { |
|
|
|
|
// 总件数
|
|
|
|
|
int size = distributionPackageEntities.size(); |
|
|
|
|
// 总件数 < 最低价 则计算保底价
|
|
|
|
|
if (size < minCost) { |
|
|
|
|
// 分摊到包件上 原单价 + 加算价格
|
|
|
|
|
distributionPackageEntities.forEach(statisticsDistributionPackageEntity -> { |
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(statisticsDistributionPackageEntity.getRealDeliveryFee().add(NumberUtil.toBigDecimal(additionalCost))); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} else if (ObjectUtil.equals(3, dispatchMinCostType)) { |
|
|
|
|
// 总体积
|
|
|
|
|
BigDecimal totalVolume = distributionPackageEntities.stream().map(StatisticsDistributionPackageEntity::getTotalVolume).reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
// 总件数 < 最低价 则计算保底价
|
|
|
|
|
if (NumberUtil.compare(NumberUtil.toDouble(totalVolume), minCost) < 0) { |
|
|
|
|
// 分摊到包件上 原单价 + 加算价格
|
|
|
|
|
distributionPackageEntities.forEach(statisticsDistributionPackageEntity -> { |
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(statisticsDistributionPackageEntity.getRealDeliveryFee().add(NumberUtil.toBigDecimal(additionalCost))); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} else if (ObjectUtil.equals(4, dispatchMinCostType)) { |
|
|
|
|
// 总重量
|
|
|
|
|
BigDecimal totalWeight = distributionPackageEntities.stream().map(StatisticsDistributionPackageEntity::getTotalWeight).reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
// 总件数 < 最低价 则计算保底价
|
|
|
|
|
if (NumberUtil.compare(NumberUtil.toDouble(totalWeight), minCost) < 0) { |
|
|
|
|
// 分摊到包件上 原单价 + 加算价格
|
|
|
|
|
distributionPackageEntities.forEach(statisticsDistributionPackageEntity -> { |
|
|
|
|
statisticsDistributionPackageEntity.setRealDeliveryFee(statisticsDistributionPackageEntity.getRealDeliveryFee().add(NumberUtil.toBigDecimal(additionalCost))); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void updateOrderChangesFee(Long orderInfoId) { |
|
|
|
|
|
|
|
|
|
StatisticsOrderInfoEntity statisticsOrderInfoEntity = baseMapper.selectById(orderInfoId); |
|
|
|
|
if(Objects.isNull(statisticsOrderInfoEntity)){ |
|
|
|
|
log.warn("#############updateOrderChangesFee: 订单信息不存在 statisticsOrderInfoEntity={}",statisticsOrderInfoEntity); |
|
|
|
|
throw new CustomerException(405,"订单信息不存在"); |
|
|
|
|
if (Objects.isNull(statisticsOrderInfoEntity)) { |
|
|
|
|
log.warn("#############updateOrderChangesFee: 订单信息不存在 statisticsOrderInfoEntity={}", statisticsOrderInfoEntity); |
|
|
|
|
throw new CustomerException(405, "订单信息不存在"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal changesFee = changesRecordService.findChangesFeeByOrderInfoId(orderInfoId); |
|
|
|
|
@ -414,102 +880,102 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
|
|
|
|
|
BigDecimal totalFee = BigDecimal.ZERO; |
|
|
|
|
|
|
|
|
|
BigDecimal pickupFee = changesRecordEntity.getPickupFee(); |
|
|
|
|
if(pickupFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (pickupFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(pickupFee); |
|
|
|
|
stringBuilder.append("提货费变更").append(pickupFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
BigDecimal freightFee = changesRecordEntity.getFreightFee(); |
|
|
|
|
if(freightFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (freightFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(freightFee); |
|
|
|
|
stringBuilder.append("运费变更").append(freightFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal warehouseFee = changesRecordEntity.getWarehouseFee(); |
|
|
|
|
if(warehouseFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (warehouseFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(warehouseFee); |
|
|
|
|
stringBuilder.append("仓储费变更").append(warehouseFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal warehouseManageFee = changesRecordEntity.getWarehouseManageFee(); |
|
|
|
|
if(warehouseManageFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (warehouseManageFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(warehouseManageFee); |
|
|
|
|
stringBuilder.append("仓储管理费变更").append(warehouseManageFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal warehouseSortingFee = changesRecordEntity.getWarehouseSortingFee(); |
|
|
|
|
if(warehouseSortingFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (warehouseSortingFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(warehouseSortingFee); |
|
|
|
|
stringBuilder.append("仓储分拣费变更").append(warehouseSortingFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal warehouseOperatingFee = changesRecordEntity.getWarehouseOperatingFee(); |
|
|
|
|
if(warehouseOperatingFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (warehouseOperatingFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(warehouseOperatingFee); |
|
|
|
|
stringBuilder.append("仓储操作费变更").append(warehouseOperatingFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal deliveryFee = changesRecordEntity.getDeliveryFee(); |
|
|
|
|
if(deliveryFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (deliveryFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(deliveryFee); |
|
|
|
|
stringBuilder.append("配送费变更").append(deliveryFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal deliveryLoadingFee = changesRecordEntity.getDeliveryLoadingFee(); |
|
|
|
|
if(deliveryLoadingFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (deliveryLoadingFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(deliveryLoadingFee); |
|
|
|
|
stringBuilder.append("配送装卸费变更").append(deliveryLoadingFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal deliverySortingFee = changesRecordEntity.getDeliverySortingFee(); |
|
|
|
|
if(deliverySortingFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (deliverySortingFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(deliverySortingFee); |
|
|
|
|
stringBuilder.append("配送分拣费变更").append(deliverySortingFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal deliveryUpfloorFee = changesRecordEntity.getDeliveryUpfloorFee(); |
|
|
|
|
if(deliveryUpfloorFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (deliveryUpfloorFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(deliveryUpfloorFee); |
|
|
|
|
stringBuilder.append("配送上楼费变更").append(deliveryUpfloorFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal deliveryMoveFee = changesRecordEntity.getDeliveryMoveFee(); |
|
|
|
|
if(deliveryMoveFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (deliveryMoveFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(deliveryMoveFee); |
|
|
|
|
stringBuilder.append("配送平移费变更").append(deliveryMoveFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal installFee = changesRecordEntity.getInstallFee(); |
|
|
|
|
if(installFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (installFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(installFee); |
|
|
|
|
stringBuilder.append("安装费变更").append(installFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal quotationFee = changesRecordEntity.getQuotationFee(); |
|
|
|
|
if(quotationFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (quotationFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(quotationFee); |
|
|
|
|
stringBuilder.append("保价费变更").append(quotationFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal claimingValue = changesRecordEntity.getClaimingValue(); |
|
|
|
|
if(claimingValue.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (claimingValue.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(claimingValue); |
|
|
|
|
stringBuilder.append("申明价值变更").append(claimingValue.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal otherFee = changesRecordEntity.getOtherFee(); |
|
|
|
|
if(otherFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (otherFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(otherFee); |
|
|
|
|
stringBuilder.append("其他费变更").append(otherFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal returnFee = changesRecordEntity.getReturnFee(); |
|
|
|
|
if(returnFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (returnFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(returnFee); |
|
|
|
|
stringBuilder.append("回扣变更").append(returnFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal thirdOprationFee = changesRecordEntity.getThirdOprationFee(); |
|
|
|
|
if(thirdOprationFee.compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
|
if (thirdOprationFee.compareTo(BigDecimal.ZERO) != 0) { |
|
|
|
|
totalFee = totalFee.add(thirdOprationFee); |
|
|
|
|
stringBuilder.append("第三方操作费变更").append(thirdOprationFee.toPlainString()).append(";"); |
|
|
|
|
} |
|
|
|
|
|
