From 72dec2f6f55b5162c5c57fe37ad8dba858d68a04 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 18 Oct 2024 23:33:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=93?= =?UTF-8?q?=E5=8D=A1=E7=9A=84=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 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 fdd77b33f..01f2d9a44 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 @@ -4839,17 +4839,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildConsigneeArriveVO(deliveryListEntity, reservationEntity, add, user); - iDistributionNodeWorkService.carArrived(nodeFanoutMsg, user); - return Resp.scanSuccess("打卡成功", "打卡成功"); + if (!Objects.isNull(add)){ + DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignforEntity.getDeliveryId()); + DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignforEntity.getReservationId()); + DistributionPositioningEntity distributionPositioning = createdDistributionPositioningEntity(deliveryListEntity, reservationEntity, AuthUtil.getUser(), driver, positioning); + if (Objects.isNull(distributionPositioning)) { + return Resp.scanFail("当前操作由司机完成", "当前操作由司机完成"); + } + //进行打卡信息保存 + distributionPositioningService.save(distributionPositioning); + NodeFanoutMsg nodeFanoutMsg = buildConsigneeArriveVO(deliveryListEntity, reservationEntity, add, user); + iDistributionNodeWorkService.carArrived(nodeFanoutMsg, user); + return Resp.scanSuccess("打卡成功", "打卡成功"); + }else{ + return Resp.scanSuccess("打卡失败", "打卡失败，请重试"); + } + } private DistributionPositioningEntity createdDistributionPositioningEntity(DistributionDeliveryListEntity deliveryListEntity,