From 192763f916babea88c94bd4a9d9889b199320e48 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 22 May 2025 11:49:22 +0800
Subject: [PATCH] refactor(common): 优化成长值流水类型枚举 ScoreFlowTypeEnum - 新增 OTHER_BUY 类型,用于好友下单获得成长值 - 修改现有类型的描述,使用"购买"替代"下单",使描述更加准确 - 统一描述格式,提高代码可读性和一致性

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index 1e2d6e1..39c3074 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -47,6 +47,7 @@
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
     private final MallCarriageRuleMapper mallCarriageRuleMapper;
     private final MallCarriageRuleInfoMapper mallCarriageRuleInfoMapper;
+    private final MallMemberCollectionMapper mallMemberCollectionMapper;
 
 
     @Override
@@ -120,6 +121,21 @@
         }
         List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
         MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
+
+        MallMember loginUser = LoginUserUtil.getLoginUser();
+        if (loginUser != null) {
+            List<MallMemberCollection> mallMemberCollections = mallMemberCollectionMapper.selectList(
+                    new LambdaQueryWrapper<MallMemberCollection>()
+                            .eq(MallMemberCollection::getGoodsId, id)
+                            .eq(MallMemberCollection::getMemberId, loginUser.getId())
+            );
+            if (CollUtil.isNotEmpty(mallMemberCollections)) {
+                mallGoodsDetailsVo.setHasCollect(1);
+            }else {
+                mallGoodsDetailsVo.setHasCollect(2);
+            }
+        }
+
         mallGoodsDetailsVo.setMainImage(mallGoods.getThumb());
 
         List<GoodsDetailsStyleVo> styles = mallGoodsDetailsVo.getStyles();
@@ -145,8 +161,9 @@
         }
         mallGoodsDetailsVo.setImages(images);
 
-        QueryWrapper<MallGoodsComment> objectQueryWrapper = new QueryWrapper<>();
-        objectQueryWrapper.eq("goods_id",id);
+        LambdaQueryWrapper<MallGoodsComment> objectQueryWrapper = new LambdaQueryWrapper<>();
+        objectQueryWrapper.eq(MallGoodsComment::getGoodsId,id);
+        objectQueryWrapper.eq(MallGoodsComment::getShowState,1);
         Integer commentCount = mallGoodsCommentMapper.selectCount(objectQueryWrapper);
         mallGoodsDetailsVo.setCommentCount(commentCount);
         return mallGoodsDetailsVo;

--
Gitblit v1.9.1