From e5f4d1e57b46b555823ada6c2ae5f34ed2eb65cb Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 15 Jan 2024 13:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4PDA=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

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 6282cff1c..5407bdab4 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
@@ -3151,15 +3151,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
 		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
 		distributionReservationMapper.updateById(reservationEntity);
-		//维护配送任务
-		distributionAsyncService.checkDeliverySignStatusByReservation(distributionSignforEntity.getDeliveryId());
-		distributionDeliveryListEntity.setDeliveryListLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-		if (distributionSignfor.getIsClerk()) {
-			distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
-		} else {
-			distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-		}
-		distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
+		//维护签收状态
+
+//		distributionAsyncService.checkDeliverySignStatusByReservation(distributionSignforEntity.getDeliveryId());
+//		distributionDeliveryListEntity.setDeliveryListLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
+//		if (distributionSignfor.getIsClerk()) {
+//			distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
+//		} else {
+//			distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
+//		}
+//		distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
 		LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
 			.eq(DistributionSignforEntity::getId, distributionSignforEntity.getId())
 			.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())
@@ -3176,6 +3177,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getSjsigningTime, simpleDateFormat.format(new Date()));
 
 		boolean update = this.update(set);
+		//维护配送信息
+		distributionDeliveryListService.maintenanceDeliveryInfo(distributionSignforEntity.getDeliveryId());
 		return R.status(true);
 	}