From 97c56c176af03b1f890cadf7a22c04340ffaedc1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 17 Jun 2025 10:13:06 +0800
Subject: [PATCH] fix(mall): 修复活动关注列表分组查询问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index 404035b..ca9392e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -12,6 +12,7 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.HappyActivityService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.mall.dto.ApiOperateDoDto;
import cc.mrbird.febs.mall.vo.activity.*;
@@ -26,6 +27,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -57,6 +59,9 @@
private final IApiMallMemberWalletService iApiMallMemberWalletService;
private final HappyActivityCategoryMapper happyActivityCategoryMapper;
private final AgentProducer agentProducer;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final HappyMemberLevelMapper happyMemberLevelMapper;
+ private final IMallMoneyFlowService mallMoneyFlowService;
@Override
public FebsResponse activityList(ApiActivityInfoDto dto) {
@@ -73,13 +78,23 @@
// 查询关注点赞转发记录，筛选出关注活动类型且未删除的关注记录，并按ID升序排序，限制结果数量为3
List<HappyFollow> happyFollows = happyFollowMapper.selectList(
new LambdaQueryWrapper<HappyFollow>()
+ .select(HappyFollow::getMemberId)
.eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode())
.eq(HappyFollow::getSourceId, record.getId())
.eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
.groupBy(HappyFollow::getMemberId)
- .orderByAsc(HappyFollow::getId)
.last("limit 3")
);
+// // 查询关注点赞转发记录，筛选出关注活动类型且未删除的关注记录，并按ID升序排序，限制结果数量为3
+// List<HappyFollow> happyFollows = happyFollowMapper.selectList(
+// new LambdaQueryWrapper<HappyFollow>()
+// .eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode())
+// .eq(HappyFollow::getSourceId, record.getId())
+// .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+// .groupBy(HappyFollow::getMemberId)
+// .orderByAsc(HappyFollow::getId)
+// .last("limit 3")
+// );
// 检查关注记录是否不为空
if(CollUtil.isNotEmpty(happyFollows)){
// 使用Stream流操作关注记录，获取所有成员ID的集合
@@ -955,6 +970,63 @@
happyActivityOrderItem.setTransferItemId(memberId);
happyActivityOrderItem.setUpdatedTime(DateUtil.date());
happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+
+ BigDecimal scorePercent = BigDecimal.ONE;
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_SIGN_SETTING.getType(),
+ DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
+ if (dic != null) {
+ ScoreSettingDto scoreSettingDto = JSONObject.parseObject(dic.getValue(), ScoreSettingDto.class);
+ BigDecimal bigDecimal = ObjectUtil.isEmpty(scoreSettingDto.getScorePercent()) ? BigDecimal.ONE : new BigDecimal(scoreSettingDto.getScorePercent());
+ if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+ scorePercent = bigDecimal;
+ }
+ }
+ BigDecimal bigDecimal = scorePercent.multiply(happyActivityOrderItem.getPrice()).setScale(0, RoundingMode.HALF_DOWN);
+ if(bigDecimal.compareTo(BigDecimal.ZERO) > 0){
+ MallMember member = mallMemberMapper.selectById(happyActivityOrderItem.getMemberId());
+ Integer director = member.getDirector();
+ // 查询与董事等级代码匹配的会员等级信息
+ LambdaQueryWrapper<HappyMemberLevel> happyMemberLevelLambdaQueryWrapper = new LambdaQueryWrapper<HappyMemberLevel>();
+ happyMemberLevelLambdaQueryWrapper.eq(HappyMemberLevel::getCode, director);
+ happyMemberLevelLambdaQueryWrapper.last("limit 1");
+ HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(happyMemberLevelLambdaQueryWrapper);
+ log.info("会员等级信息:{}", JSONUtil.toJsonStr(happyMemberLevel));
+ if(ObjectUtil.isNotEmpty(happyMemberLevel)){
+ BigDecimal amount = happyActivityOrderItem.getPrice();
+ // 计算自己获得的积分
+ BigDecimal minePercent = happyMemberLevel.getMinePercent();
+ BigDecimal mineScore = amount.multiply(minePercent).multiply(scorePercent).setScale(0, RoundingMode.HALF_DOWN);
+ log.info("下单获得积分:{}", mineScore);
+ if(mineScore.compareTo(BigDecimal.ZERO) > 0){
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ mineScore,
+ ScoreFlowTypeEnum.ACTIVITY_INSURE_PRIZE_SCORE.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format( ScoreFlowTypeEnum.ACTIVITY_INSURE_PRIZE_SCORE.getDesc(),mineScore),
+ 2);
+ iApiMallMemberWalletService.add(mineScore,memberId , "prizeScore");
+
+ // 记录会员购买获得的经验
+ BigDecimal multiply = amount.multiply(minePercent).setScale(2, RoundingMode.HALF_DOWN);
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ multiply,
+ ScoreFlowTypeEnum.ACTIVITY_INSURE_SCORE.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.ACTIVITY_INSURE_SCORE.getDesc(),multiply),
+ 2
+ );
+ // 更新会员钱包中的分数
+ iApiMallMemberWalletService.add(multiply, memberId, "score");
+ // 发送会员等级升级消息
+ agentProducer.sendVipLevelUp(memberId);
+ }
+ }
+ }
agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
return new FebsResponse().success().message("操作成功");
}
--
Gitblit v1.9.1