From bda8ee7ef06eb6014621ceb70843b201bf25ab0f Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 6 Dec 2024 11:16:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=BF=90=E5=8D=95=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E7=9A=84=E6=97=A5=E5=BF=97=E9=87=8D=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/feign/DistributionSignforClient.java | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java        | 6 ++----
 .../com/logpm/trunkline/mq/waybil/StatusLogListener.java    | 5 +++--
 .../service/impl/TrunklineWaybillTrackServiceImpl.java      | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java
index b27061418..723bbce97 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java
@@ -146,7 +146,7 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 			if (!distributionReservationEntities.isEmpty()) {
 				List<Long> collect = distributionReservationEntities.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList());
 				for (Long reservationId : collect) {
-					log.info(">>>>>>>>>>handletrunklineWaybillSignLog ",reservationId);
+					log.info(">>>>>>>>>>handletrunklineWaybillSignLog {}",reservationId);
 					distributionSignforService.handletrunklineWaybillSignLog(reservationId);
 				}
 			}
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 55d5f1047..86c8f81f0 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
@@ -7099,10 +7099,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		log.info(">>>> updateSign isSuccess ={}", isSuccess);
 		buildArgsToPushMq(distributionSignfor);
 		if (isSuccess) {
-			//整理签收数据回退干线
-			handletrunklineWaybillSignLog(distributionSignfor.getReservationId());
-
-
+			//理签收数据回退干线
+			//handletrunklineWaybillSignLog(distributionSignfor.getReservationId());
 			this.updateById(distributionSignfor);
 			// 创建异步队列推送老系统的的签收信息 构建请求参数
 			return R.status(true);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java
index 7f5dbf764..49c2dc82d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java
@@ -121,8 +121,9 @@ public class StatusLogListener {
 		BizOperationEnums bizOperation = bean.getBizOperation();
 		List<PackageData> details = vo.getPackageDataList();
 
-		// 按照运单号进行分组 后面的集合 按照创建时间进行排序
-		Map<String, List<PackageData>> map = details.stream().collect(Collectors.groupingBy(PackageData::getWaybillNumber));
+		// 按照运单号进行分组 后面的集合 按照创建时间进行排序 运单号不能为null
+
+		Map<String, List<PackageData>> map = details.stream().filter(t->ObjectUtil.isNotNull(t.getWaybillNumber())).collect(Collectors.groupingBy(PackageData::getWaybillNumber));
 		// 根据运单号  统计 每个运单的数量
 		Map<String, Integer> waybillCountMap = new HashMap<>();
 
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 00d939e10..5aeadb9ec 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
@@ -86,6 +86,7 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 				updateWaybill.setSignCheckTime(new Date());
 				updateWaybill.setDeliveryTime(waybillLogDTO.getDeliveryTime() == null?null:waybillLogDTO.getDeliveryTime());
 				updateWaybill.setDeliveryDriverName(waybillLogDTO.getDriverName()==null?"":waybillLogDTO.getDriverName());
+
 				warehouseWaybillClient.updateEntity(updateWaybill);
 				warehouseWaybillEntity.setSignNum(updateWaybill.getSignNum());