From b933c7cdaea1386d50085b1602e4ee2729ac9af2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 26 May 2025 16:05:14 +0800
Subject: [PATCH] fix(mall): 修复拼团团长详情页面订单信息展示问题- 将 ApiHappyOrderLeaderVo 中的 itemId 字段类型从 String 改为 Long - 在 ApiMallTeamLeaderServiceImpl 中为 apiHappyOrderLeaderVo 设置正确的 itemId值

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberCollectionServiceImpl.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberCollectionServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberCollectionServiceImpl.java
index 3b16dcd..933695b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberCollectionServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberCollectionServiceImpl.java
@@ -47,15 +47,12 @@
         queryWrapper.eq(MallMemberCollection::getMemberId, member.getId());
         queryWrapper.eq(MallMemberCollection::getGoodsId, addCollectionDto.getGoodsId());
         List<MallMemberCollection> mallMemberCollections = this.baseMapper.selectList(queryWrapper);
-        if (CollUtil.isNotEmpty(mallMemberCollections)) {
-            throw new FebsException("商品已收藏");
+        if (CollUtil.isEmpty(mallMemberCollections)) {
+            MallMemberCollection collection = new MallMemberCollection();
+            collection.setMemberId(member.getId());
+            collection.setGoodsId(addCollectionDto.getGoodsId());
+            this.baseMapper.insert(collection);
         }
-
-        MallMemberCollection collection = new MallMemberCollection();
-        collection.setMemberId(member.getId());
-        collection.setGoodsId(addCollectionDto.getGoodsId());
-
-        this.baseMapper.insert(collection);
     }
 
     @Override
@@ -76,8 +73,20 @@
     @Override
     public void del(String ids) {
         MallMember member = LoginUserUtil.getLoginUser();
-        List<String> idsList = StrUtil.split(ids, ',');
+        List<String> goodsIdList = StrUtil.split(ids, ',');
+        if (CollUtil.isEmpty(goodsIdList)) {
+            return;
+        }
 
+        LambdaQueryWrapper<MallMemberCollection> query = new LambdaQueryWrapper<>();
+        query.in(MallMemberCollection::getGoodsId, goodsIdList);
+        query.eq(MallMemberCollection::getMemberId, member.getId());
+        List<MallMemberCollection> collections = this.baseMapper.selectList(query);
+        if (CollUtil.isEmpty(collections)) {
+            return;
+        }
+
+        List<Long> idsList = collections.stream().map(MallMemberCollection::getId).collect(Collectors.toList());
         LambdaQueryWrapper<MallMemberCollection> delQuery = new LambdaQueryWrapper<>();
         delQuery.in(MallMemberCollection::getId, idsList);
         delQuery.eq(MallMemberCollection::getMemberId, member.getId());

--
Gitblit v1.9.1