Merge remote-tracking branch 'origin/main'

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

@@ -286,7 +286,7 @@ public class VoyageApiImpl implements VoyageApi {
                 VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
                 detailReqVO.setVoyageId(voyageId);
                 detailReqVO.setType(type);
-                detailReqVO.setObjectId(distributorId);
+                detailReqVO.setDistributorId(distributorId);
                 List<VoyageStockDistributeNewRespVO> distributeNewResp = voyageStockDistributeNewService.getDetail(detailReqVO);
                 List<VoyageStockDistributeNewDO> list = BeanUtils.toBean(distributeNewResp, VoyageStockDistributeNewDO.class);
                 if (list != null && !list.isEmpty()) {
@@ -356,7 +356,7 @@ public class VoyageApiImpl implements VoyageApi {
         VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
         detailReqVO.setVoyageId(voyageId);
         detailReqVO.setType(type);
-        detailReqVO.setObjectId(distributorId);
+        detailReqVO.setDistributorId(distributorId);
         //先获取非共享库存（分销商库存）
         detailReqVO.setEnableShare(YesOrNoEnum.NO.getType());
         List<VoyageStockDistributeNewRespVO> distributeNewResps = productRedisUtils.getList(ProductRedisKeyConstants.STOCK_DISTRIBUTOR_REDIS_KEY_PREFIX + voyageId + "_" + distributorId, VoyageStockDistributeNewRespVO.class, 1);
@@ -679,7 +679,7 @@ public class VoyageApiImpl implements VoyageApi {
             VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
             detailReqVO.setVoyageId(voyageId);
             detailReqVO.setType(type);
-            detailReqVO.setObjectId(distributorId);
+            detailReqVO.setDistributorId(distributorId);
             List<VoyageStockDistributeNewRespVO> distributeNewRespList = voyageStockDistributeNewService.getDetail(detailReqVO);
             List<VoyageStockDistributeNewDO> list = BeanUtils.toBean(distributeNewRespList, VoyageStockDistributeNewDO.class);
             log.info("进入初定还分销商库存详情操作,分销商库存还之前详情-distributeNewRespList：{}", JSONArray.toJSONString(distributeNewRespList));
@@ -759,7 +759,7 @@ public class VoyageApiImpl implements VoyageApi {
         VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
         detailReqVO.setVoyageId(voyageId);
         detailReqVO.setType(type);
-        detailReqVO.setObjectId(distributorId);
+        detailReqVO.setDistributorId(distributorId);
         //先获取非共享库存（分销商库存）
         detailReqVO.setEnableShare(YesOrNoEnum.NO.getType());
         List<VoyageStockDistributeNewRespVO> distributeNewRespList = productRedisUtils.getList(ProductRedisKeyConstants.STOCK_DISTRIBUTOR_REDIS_KEY_PREFIX + voyageId + "_" + distributorId, VoyageStockDistributeNewRespVO.class, 1);