Browse Source

fix:

修复配送计划多个司机的情况
pull/30/head
pref_mail@163.com 11 months ago
parent
commit
7c33fc73d8
  1. 34
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

34
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@ -340,10 +340,36 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionDeliveryListVO.setReservationList(customList);
//查询司机信息
if (Objects.equals(distributionDeliveryListVO.getKind(), "1")) {
DistributionDeliverySelfEntity deliverySelfServiceOne = distributionDeliverySelfService.getOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2));
distributionDeliveryListVO.setDriverName(deliverySelfServiceOne.getDriverName());
distributionDeliveryListVO.setDriverPhone(deliverySelfServiceOne.getDriverPhone());
distributionDeliveryListVO.setVehicleName(deliverySelfServiceOne.getVehicleNub());
List<DistributionDeliverySelfEntity> deliverySelfServices = distributionDeliverySelfService.list(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2));
if(!deliverySelfServices.isEmpty()){
StringBuffer sb1 = new StringBuffer();
StringBuffer sb2 = new StringBuffer();
StringBuffer sb3 = new StringBuffer();
deliverySelfServices.forEach(t->{
if(!sb1.toString().isEmpty()){
sb1.append("/");
}
sb1.append(t.getDriverName());
if(!sb2.toString().isEmpty()){
sb2.append("/");
}
sb2.append(t.getDriverPhone());
if(!sb3.toString().isEmpty()){
sb3.append("/");
}
sb3.append(t.getVehicleNub());
});
distributionDeliveryListVO.setDriverName(sb1.toString());
distributionDeliveryListVO.setDriverPhone(sb2.toString());
distributionDeliveryListVO.setVehicleName(sb3.toString());
}
} else {
DistributionDeliveryTripartiteEntity deliveryTripartiteEntity = distributionDeliveryTripartiteService.getOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionDeliveryListVO.getId()));
distributionDeliveryListVO.setDriverName(deliveryTripartiteEntity.getDriverName());

Loading…
Cancel
Save