From 0b39fe9f55d57e992d3a3bf2595f72743b93a1f4 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 8 Jul 2024 14:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E4=B8=BB=E5=8F=B8=E6=9C=BABU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java  | 7 +++++--
 .../service/impl/DistributionReservationServiceImpl.java   | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index c8cbcbba2..48399f9e3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -3576,6 +3576,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				break;
 		}
 		List<DistributionDeliverySelfDTO> allocationInfo = deliveryListDTO.getAllocationInfo();
+		if (Strings.isBlank(deliveryListDTO.getMasterDriverName())){
+			//无主司机信息  进行主司机默认赋予
+			deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
+		}
 		if (Func.isEmpty(allocationInfo)) {
 			//这里就表示是三方配送
 			DistributionDeliveryTripartiteDTO tripartite = deliveryListDTO.getTripartite();
@@ -3593,7 +3597,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		} else {
 			StringBuilder driverNames = new StringBuilder();
 			StringBuilder vehicleNubs = new StringBuilder();
-			if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())) {
+			if (Func.isEmpty( deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())) {
 				//检测无主司机  进行随机赋予主司机
 				deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
 				deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub());
@@ -3604,7 +3608,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				if (a.getDriverName().equals(deliveryListDTO.getMasterDriverName()) && a.getVehicleNub().equals(deliveryListDTO.getMasterVehicleNub())) {
 					deliverySelfEntity.setIsMaster(ServiceConstant.IS_MASTER_YES);
 					driverNames.append(deliverySelfEntity.getDriverName()).append("(主),");
-
 				} else {
 					driverNames.append(deliverySelfEntity.getDriverName()).append(",");
 				}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index afdcf18c4..1f78c1e0d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2381,6 +2381,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		} else {
 			//自主配送
 			List<DistributionDeliverySelfDTO> allocationInfo = allocationDTO.getAllocationInfo();
+			if (Strings.isBlank(allocationDTO.getMasterDriverName())){
+				//无主司机信息  进行主司机默认赋予
+				allocationDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
+			}
 			allocationInfo.forEach(a -> {
 				DistributionDeliverySelfEntity distributionDeliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
 				//设置车辆编号