|
|
|
@ -4839,17 +4839,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
Boolean driver = distributionDeliveryListService.judgeIsDriver(user); |
|
|
|
|
String positioning = distributionSignfor.getPositioning(); |
|
|
|
|
GAddressVo add = GaoDeApiUtil.getAdd(positioning); |
|
|
|
|
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<ConsigneeArriveVO> 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<ConsigneeArriveVO> nodeFanoutMsg = buildConsigneeArriveVO(deliveryListEntity, reservationEntity, add, user); |
|
|
|
|
iDistributionNodeWorkService.carArrived(nodeFanoutMsg, user); |
|
|
|
|
return Resp.scanSuccess("打卡成功", "打卡成功"); |
|
|
|
|
}else{ |
|
|
|
|
return Resp.scanSuccess("打卡失败", "打卡失败,请重试"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private DistributionPositioningEntity createdDistributionPositioningEntity(DistributionDeliveryListEntity deliveryListEntity, |
|
|
|
|