组装数据

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/InteractRecordBuilder.java

@@ -148,12 +148,17 @@ public class InteractRecordBuilder {
             if (CollectionUtils.isNotEmpty(extendGoodsInfos)) {
                 Map<String, InteractRecordExtendInfoBO.ExtendGoodsInfo> goodsInfoMap = extendGoodsInfos.stream()
                         .collect(Collectors.toMap(InteractRecordExtendInfoBO.ExtendGoodsInfo::getGoodsId, Function.identity(),(e,x)->e));
-                List<List<InteractRecordExtendInfoBO.ExtendGoodsInfo>> groupExtendGoodsInfos = groupGoodsIds.stream()
-                        .map(group -> group.stream()
-                                .map(goodsInfoMap::get)
-                                .filter(Objects::nonNull)
-                                .collect(Collectors.toList()))
-                        .collect(Collectors.toList());
+                List<List<InteractRecordExtendInfoBO.ExtendGoodsInfo>> groupExtendGoodsInfos = new ArrayList<>();
+                for (List<String> groupGoodsId : groupGoodsIds) {
+                    List<InteractRecordExtendInfoBO.ExtendGoodsInfo> list =
+                            groupGoodsId.stream()
+                            .map(goodsInfoMap::get)
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(list)) {
+                        groupExtendGoodsInfos.add(list);
+                    }
+                }
                 extendInfo.setGroupExtendGoodsInfos(groupExtendGoodsInfos);
                 extendInfo.setGroupInvalidGoodsNum(groupGoodsIdList.size() - groupExtendGoodsInfos.stream().mapToInt(List::size).sum());
             }