DistributionParcelNumberServiceImpl循环依赖问题

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -301,7 +301,7 @@ public class DistributionReservationController extends BladeController {
 	@GetMapping("/getReservationPackageList")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入distrbutionReservation")
-	public R<?> getReservationPackageList(@RequestParam String reservationId) {
+	public R<?> getReservationPackageList(@RequestParam Long reservationId) {
 		R<?> reservationPackage = reservationService.getReservationPackageList(reservationId);
 		return reservationPackage;
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -165,7 +165,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @param reservationId
 	 * @return
 	 */
-	R<?> getReservationPackageList(String reservationId);
+	R<?> getReservationPackageList(Long reservationId);
 
     List<DistributionReservationEntity> selectListByIds(List<Long> reservationIds);
 

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

@@ -52,6 +52,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class DistributionParcelNumberServiceImpl extends BaseServiceImpl<DistributionParcelNumberMapper, DistributionParcelNumberEntity> implements IDistributionParcelNumberService {
 
+	@Lazy
 	@Autowired
 	private IDistributionParcelListService distributionParcelListService;
 

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

@@ -30,10 +30,7 @@ import com.logpm.distribution.excel.DistributionReservationExcel;
 import com.logpm.distribution.mapper.*;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
-import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
-import com.logpm.distribution.wrapper.DistributionReservationWrapper;
-import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
-import com.logpm.distribution.wrapper.DistributionStockListWrapper;
+import com.logpm.distribution.wrapper.*;
 import com.logpm.oldproject.entity.WayBillEntity;
 import com.logpm.oldproject.feign.IWayBillClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
@@ -179,6 +176,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Autowired
 	private IWayBillClient wayBillClient;
 
+	@Lazy
 	@Autowired
 	private IDistributionParcelNumberService distributionParcelNumberService;
 
@@ -2313,14 +2311,56 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public R<?> getReservationPackageList(String reservationId) {
-		if (Func.isBlank(reservationId)) {
+	public R<?> getReservationPackageList(Long reservationId) {
+		if (Func.isNotEmpty(reservationId)) {
 			log.error("参数异常reservationId+{" + reservationId + "}");
 			return R.fail("服务器正忙!!");
 		}
-		List<DistributionParcelListEntity> distributionParcelListEntityList = distributionReservationPackageMapper.getReservationPackageList(reservationId);
-		List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntityList);
-		return R.data(parcelListVOS);
+		List<DistributionReservationStockarticleEntity> distributionReservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
+			.eq(DistributionReservationStockarticleEntity::getReservationId, reservationId)
+			.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
+		ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
+		if (Func.isNotEmpty(distributionReservationStockarticleEntityList)){
+			distributionReservationStockarticleEntityList.forEach(rs->{
+				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){
+					List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+						.eq(DistributionReservationPackageEntity::getReservationId, reservationId)
+						.eq(DistributionReservationPackageEntity::getStockArticleId, rs.getStockArticleId())
+						.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue()));
+					if (Func.isNotEmpty(reservationPackageEntityList)){
+						reservationPackageEntityList.forEach(rp->{
+							DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId());
+							distributionParcelListVOS.add(DistributionParcelListWrapper.build().entityVO(parcelListEntity));
+						});
+					}else {
+						log.error("####################此预约下订单查询包件信息错误,订单ID为:{}",rs.getStockArticleId());
+					}
+				}else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){
+					List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+						.eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId)
+						.eq(DistributionReservationZeroPackageEntity::getStockArticleId, rs.getStockArticleId())
+						.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()));
+					if (Func.isNotEmpty(reservationZeroPackageEntities)){
+						reservationZeroPackageEntities.forEach(rp->{
+
+
+						});
+
+
+					}else {
+						log.error("####################此预约下零担订单查询品类信息错误,订单ID为:{}",rs.getStockArticleId());
+					}
+				}else {
+					log.error("##################3预约订单isZero字段值错误,订单ID为:{}",rs.getStockArticleId());
+				}
+			});
+
+		}
+
+
+//		List<DistributionParcelListEntity> distributionParcelListEntityList = distributionReservationPackageMapper.getReservationPackageList(reservationId);
+//		List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntityList);
+		return R.data(distributionParcelListVOS);
 	}
 
 	@Override