预约修复

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

@@ -1251,7 +1251,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//这里站配送任务主要有两个方面
 		//1、针对市配订单需要将预约信息填充至配送计划中
 		//2、商配跳过预约阶段直接将订单信息和配送计划进行关联
-		if (Func.isEmpty(allocationDTO)) {
+		if (Objects.isNull(allocationDTO)) {
 			log.error("参数异常allocationDTO:+{" + allocationDTO + "}");
 			return R.fail("服务器正忙!!!");
 		}
@@ -1289,7 +1289,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//司机名称拼接
 		StringBuilder driverNames = new StringBuilder();
 		//查询根据预约ID查询这些预约的备货状态
-		List<DistributionReservationEntity> reservationEntityList = baseMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda().eq(DistributionReservationEntity::getId, ids));
+		List<DistributionReservationEntity> reservationEntityList = baseMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda()
+			.in(DistributionReservationEntity::getId, ids)
+		);
 		//判断是否存在预约进行了配送任务的提交
 		boolean match = reservationEntityList.stream().anyMatch(r -> ReservationStatusConstant.daipeisong.getValue().equals(r.getReservationStatus()));
 		if (match) {
@@ -1322,7 +1324,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				continue;
 			}
 			if (Func.equals(reservationEntity.getStockupStatus(), ReservationStockupStatusConstant.weibeihuo.getValue())) {
-				//如果预约已经备货
+				//如果预约未进行备货
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 				stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
 				stockupInfoEntity.setReservationId(ids.get(i));