Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
-  newTag: 595fbc698b6d9a78c9b0df5634c6b67dc7c37829
+  newTag: cd05ab05aaa2d52cc7863771664bf3fa6ae452a7

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumDynamicDO.java

@@ -123,6 +123,7 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
                 .forumReviewVO(this.forumReviewVO)
                 .forumGambitDTOList(this.gambitDTOList)
                 .transpond(this.transpond)
+                .goodsId(this.goodsId)
                 .build();
     }
 

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -587,11 +587,10 @@ public class DynamicServiceImpl implements DynamicService {
         }
 
         // 帖子id 获取商品id
-        List<DynamicVO> collect = dynamicVOList.stream().map(item -> {
+        List<DynamicVO> collect = dynamicVOList.stream().peek(item -> {
             Integer goodsId = item.getGoodsId();
             MallGoodsVO result = pmsAppApi.mallGoodsDetails(goodsId).getResult();
             item.setMallGoodsVO(result);
-            return item;
         }).collect(Collectors.toList());
 
         return PageResult.buildPage(pageNo, pageSize, count, collect);

release-service/src/main/resources/mapper/forum/DynamicMapper.xml

@@ -426,6 +426,7 @@
         fd.create_time,
         fd.id AS dynamicId,
         transpond,
+        fd.goods_id,
         ROW_NUMBER() OVER (PARTITION BY fd.id ORDER BY fd.create_time DESC) AS rn
         FROM forum_dynamic fd
         WHERE is_deleted = 0