Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -441,7 +441,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		PriceClientVO price = priceClient.price(BasicdatPriceApiVO.builder()
 			.clientId(consigneeId.toString())
 			.brandId(brandId.toString())
-			.time(DateUtil.formatTime(createTime))
+			.time(DateUtil.formatDate(createTime))
 			.build());
 		if (ObjectUtil.isEmpty(price)) {
 			log.warn("#############calculateRealCost: 未维护价格，无法计算。");
@@ -450,7 +450,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		// 查询包件数据
 		List<StatisticsDistributionPackageEntity> distributionPackageEntities = distributionPackageService.list(new QueryWrapper<StatisticsDistributionPackageEntity>().lambda().eq(StatisticsDistributionPackageEntity::getOrderInfoId, id));
 		// 校验是否全部配送完成
-		if (distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == 0)) {
+		if (CollUtil.isEmpty(distributionPackageEntities) || distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> NumberUtil.equals(0, distributionPackageEntity.getIsSign()))) {
 			log.warn("#############calculateRealCost: 订单未全部配送完成，无法计算。");
 			throw new CustomerException(405, "订单未全部配送完成，无法计算。");
 		}