From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 9881d10..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
@@ -108,7 +108,7 @@
                             .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.LIKE.getCode(), StateUpDownEnum.SHARE.getCode()))
+                            .in(HappyFollow::getType, Arrays.asList(StateUpDownEnum.FOLLOW.getCode(), StateUpDownEnum.LIKE.getCode(), StateUpDownEnum.SHARE.getCode()))
                             .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
             );
             if(CollUtil.isNotEmpty(happyFollows)){
@@ -119,6 +119,8 @@
                 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