From 92c26cea4de00349b346f71da3cf530b26c31eb0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 10 Jun 2025 09:40:59 +0800
Subject: [PATCH] fix(mall): 修复用户重复加入标签的问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java
index 602c0df..0cbbe04 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java
@@ -3,9 +3,11 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.StateUpDownEnum;
import cc.mrbird.febs.mall.dto.activity.ApiScInfoDto;
+import cc.mrbird.febs.mall.entity.HappyFollow;
import cc.mrbird.febs.mall.entity.HappySocialCircle;
import cc.mrbird.febs.mall.entity.HappySocialCircleCategory;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.mapper.HappyFollowMapper;
import cc.mrbird.febs.mall.mapper.HappySocialCircleCategoryMapper;
import cc.mrbird.febs.mall.mapper.HappySocialCircleMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
@@ -14,6 +16,7 @@
import cc.mrbird.febs.mall.vo.activity.ApiScCategoryInfoVo;
import cc.mrbird.febs.mall.vo.activity.ApiScInfoVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,8 +24,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -30,6 +33,7 @@
public class ApiHappySocialCircleServiceImpl extends ServiceImpl<HappySocialCircleMapper, HappySocialCircle> implements ApiHappySocialCircleService {
private final HappySocialCircleCategoryMapper happySocialCircleCategoryMapper;
+ private final HappyFollowMapper happyFollowMapper;
private final MallMemberMapper mallMemberMapper;
@Override
public FebsResponse allCategory() {
@@ -39,7 +43,7 @@
.select(HappySocialCircleCategory::getId, HappySocialCircleCategory::getName)
.eq(HappySocialCircleCategory::getState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
- .orderByDesc(HappySocialCircleCategory::getOrderCnt)
+ .orderByAsc(HappySocialCircleCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(happySocialCircleCategories)){
for (HappySocialCircleCategory happySocialCircleCategory : happySocialCircleCategories) {
@@ -61,7 +65,7 @@
.eq(HappySocialCircleCategory::getState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getHotState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
- .orderByDesc(HappySocialCircleCategory::getOrderCnt)
+ .orderByAsc(HappySocialCircleCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(happySocialCircleCategories)){
for (HappySocialCircleCategory happySocialCircleCategory : happySocialCircleCategories) {
@@ -98,6 +102,26 @@
apiScInfoVo.setIndexFile(happySocialCircle.getIndexFile());
apiScInfoVo.setContent(happySocialCircle.getContent());
apiScInfoVo.setCreatedTime(happySocialCircle.getCreatedTime());
+
+ List<HappyFollow> happyFollows = happyFollowMapper.selectList(
+ new LambdaQueryWrapper<HappyFollow>()
+ .select(HappyFollow::getId, HappyFollow::getType)
+ .eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_SOCIAL_CIRCLE.getCode())
+ .eq(HappyFollow::getSourceId, happySocialCircle.getId())
+ .in(HappyFollow::getType, Arrays.asList(StateUpDownEnum.FOLLOW.getCode(), StateUpDownEnum.LIKE.getCode(), StateUpDownEnum.SHARE.getCode()))
+ .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ if(CollUtil.isNotEmpty(happyFollows)){
+ // 使用Stream流操作happyFollows，按照type分类，返回每一个不同type的总数量，并返回一个Map
+ Map<Integer, Long> typeCountMap = happyFollows.stream()
+ .collect(Collectors.groupingBy(HappyFollow::getType, Collectors.counting()));
+ Long zanCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.LIKE.getCode()), 0L);
+ apiScInfoVo.setZanCnt(Math.toIntExact(zanCnt));
+ Long sendCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.SHARE.getCode()), 0L);
+ apiScInfoVo.setSendCnt(Math.toIntExact(sendCnt));
+ Long followCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.FOLLOW.getCode()), 0L);
+ apiScInfoVo.setFollowCnt(Math.toIntExact(followCnt));
+ }
}
return new FebsResponse().success().data(apiScInfoVo);
}
--
Gitblit v1.9.1