merge:feature-0427-itemQueryEx:operator:hzhuyuanyuan@corp.netease.com:auto_branc…

merge:feature-0427-itemQueryEx:operator:hzhuyuanyuan@corp.netease.com:auto_branch_merge_by_branchService_end

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/SupplierItemServiceImpl.java

@@ -48,13 +48,13 @@ public class SupplierItemServiceImpl implements ISupplierItemService {
         List<SupplierGoodsInfoRsp> data = listAjaxResponse.getData();
         List<SpuTO> spuTOList = new ArrayList<>();
         if (data != null) {
+            List<String> commonProps = new ArrayList<>();
+            commonProps.add("sku");
+            commonProps.add("skuSpec");
             Set<Long> fullItemIds = data.stream().map(SupplierGoodsInfoRsp::getItemId).collect(Collectors.toSet());
             log.debug("[op:supplierGoodsInfoBySupplier] fullItemIds: {}", fullItemIds);
             while (fullItemIds.size() > 200) {
                 List<Long> itemIds = new ArrayList<>(fullItemIds).subList(0, 200);
-                List<String> commonProps = new ArrayList<>();
-                commonProps.add("sku");
-                commonProps.add("skuSpec");
                 AjaxResult<List<SpuTO>> listAjaxResult = itemRpcService
                     .batchQuerySpuInfo(BatchQuerySpuInfoParam.builder().ids(itemIds).commonProps(commonProps).build());
                 List<SpuTO> pageSpuTo = listAjaxResult.getData();
@@ -65,7 +65,7 @@ public class SupplierItemServiceImpl implements ISupplierItemService {
             }
             List<Long> itemIds = new ArrayList<>(fullItemIds);
             AjaxResult<List<SpuTO>> listAjaxResult = itemRpcService
-                .batchQuerySpuInfo(BatchQuerySpuInfoParam.builder().ids(itemIds).build());
+                .batchQuerySpuInfo(BatchQuerySpuInfoParam.builder().ids(itemIds).commonProps(commonProps).build());
             List<SpuTO> pageSpuTo = listAjaxResult.getData();
             if (!CollectionUtils.isEmpty(pageSpuTo)) {
                 spuTOList.addAll(pageSpuTo);