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