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/HappyActivityServiceImpl.java |  162 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 106 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 c5cde7a..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;
@@ -83,7 +84,6 @@
                                 .eq(HappyFollow::getSourceId, record.getId())
                                 .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
                                 .groupBy(HappyFollow::getMemberId)
-                                .orderByAsc(HappyFollow::getId)
                                 .last("limit 3")
                 );
 //                // 查询关注点赞转发记录,筛选出关注活动类型且未删除的关注记录,并按ID升序排序,限制结果数量为3
@@ -972,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("操作成功");
     }
@@ -1040,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