From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 c3e54e8..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();

--
Gitblit v1.9.1