From 5538b26be505fcf27c4440cadd4787e1c975ac62 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 25 Jul 2025 11:52:11 +0800
Subject: [PATCH] fix:修复投票活动群组图片双击上传问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 173 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 117 insertions(+), 56 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 b10d55f..90d7ab9 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
@@ -50,6 +50,7 @@
private final HappyFollowMapper happyFollowMapper;
private final MallMemberMapper mallMemberMapper;
+ private final HappyActivityMapper happyActivityMapper;
private final HappyActivityOptionMapper happyActivityOptionMapper;
private final HappyActivityConnectMapper happyActivityConnectMapper;
private final HappyActivityOrderMapper happyActivityOrderMapper;
@@ -78,13 +79,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的集合
@@ -961,62 +972,64 @@
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);
- }
- }
- }
+
+// 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("操作成功");
}
@@ -1029,6 +1042,54 @@
*/
@Override
public void checkActivityItem(Long orderId) {
+ HappyActivityOrderItem entity = happyActivityOrderItemMapper.selectOne(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, orderId)
+ .last("limit 1")
+ );
+ if(ObjectUtil.isNotNull( entity)){
+
+ Long activityId = entity.getActivityId();
+ HappyActivity happyActivity = happyActivityMapper.selectById(activityId);
+ if (ObjectUtil.isNotNull(happyActivity)){
+ Long memberId = entity.getMemberId();
+ Integer scoreCnt = ObjectUtil.isNull(happyActivity.getScoreCnt()) ? 0 : happyActivity.getScoreCnt();
+ if(scoreCnt > 0){
+ BigDecimal mineScore = new BigDecimal(scoreCnt).setScale(0, RoundingMode.DOWN);
+ log.info("下单获得积分:{}", mineScore);
+ 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");
+ }
+
+ Integer growthCnt = ObjectUtil.isNull(happyActivity.getGrowthCnt()) ? 0 : happyActivity.getGrowthCnt();
+ if(growthCnt > 0){
+ BigDecimal multiply = new BigDecimal(growthCnt).setScale(0, RoundingMode.DOWN);
+ log.info("下单获得的成长值:{}", multiply);
+ // 记录会员购买获得的经验
+ 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);
+ }
+ }
+ }
// 查询指定订单ID的活动订单项数量，且状态为"未使用"
Integer integer = happyActivityOrderItemMapper.selectCount(
new LambdaQueryWrapper<HappyActivityOrderItem>()
--
Gitblit v1.9.1