Merge branch 'feature-recommend' into 'developer'

无效商品数量逻辑修改

See merge request !2720

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

@@ -119,7 +119,7 @@ public class InteractRecordBuilder {
                                     .collect(Collectors.toList()))
                             .collect(Collectors.toList());
                     extendInfo.setGroupExtendGoodsInfos(groupExtendGoodsInfos);
-                    extendInfo.setGroupInvalidGoodsNum(groupGoodsIdList.size() - extendGoodsInfos.size());
+                    extendInfo.setGroupInvalidGoodsNum(groupGoodsIdList.size() - groupExtendGoodsInfos.stream().mapToInt(List::size).sum());
                 }
             }
             // 浏览商品事件