feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt ...

Administrator

2025-07-07 df864d1d636751424fd642d3bdd33c53cf63500d

feat(mall): 为活动订单项添加积分和成长值奖
- 在活动添加和编辑页面增加积分和成长值输入字段
- 更新活动实体类，添加 scoreCnt 和 growthCnt 字段
- 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放
- 优化活动订单项状态检查逻辑，移除冗余代码

 src/main/java/cc/mrbird/febs/mall/entity/HappyActivity.java

@@ -38,6 +38,8 @@
     `DELETE_FLAG` int(11) DEFAULT '0' COMMENT '删除标识 0-未删除 1-已删除',
     `vote_cnt` int(11) DEFAULT NULL COMMENT '投票数量',
     `add_state` int(11) DEFAULT '0' COMMENT '是否允许报名 0-不允许 1-允许',
     `score_cnt` int(11) DEFAULT '0' COMMENT '获得积分数量',
     `growth_cnt` int(11) DEFAULT '0' COMMENT '获得成长值数量',
     */
    private Long categoryId;
    @TableField(exist = false)
@@ -66,6 +68,8 @@
    private Integer deleteFlag;
    private Integer voteCnt;
    private Integer addState;
    private Integer scoreCnt;
    private Integer growthCnt;


}

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java

@@ -13,6 +13,7 @@
import cc.mrbird.febs.mall.vo.AdminMallGoodsCommentVo;
import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo;
import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
@@ -43,6 +44,7 @@
    private final HappyActivityOrderItemMapper happyActivityOrderItemMapper;
    private final HappyFollowMapper happyFollowMapper;
    private final MallMemberMapper mallMemberMapper;
    private final AgentProducer agentProducer;

    @Override
    public IPage<HappyActivityCategory> getGroupList(AdminHappyActivityCategoryDto dto, QueryRequest request) {
@@ -222,6 +224,8 @@
        happyActivity.setBackImg(dto.getBackImg());
        happyActivity.setVoteCnt(dto.getVoteCnt());
        happyActivity.setAddState(dto.getAddState());
        happyActivity.setScoreCnt(dto.getScoreCnt());
        happyActivity.setGrowthCnt(dto.getGrowthCnt());
        this.baseMapper.updateById(happyActivity);

        return new FebsResponse().success().message("操作成功");
@@ -504,6 +508,9 @@
                happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
                happyActivityOrderItem.setUpdatedTime(DateUtil.date());
                happyActivityOrderItemMapper.updateById(happyActivityOrderItem);


                agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
            });
        }
        return new FebsResponse().success().message("操作成功");

 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;
@@ -971,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("操作成功");
    }
@@ -1039,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>()

 src/main/resources/templates/febs/views/modules/votesActivity/add.html

@@ -147,6 +147,25 @@

                                <div class="layui-row layui-col-space10 layui-form-item">
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">积分：</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="scoreCnt" lay-verify="required"
                                                   placeholder="" autocomplete="off" class="layui-input">
                                            <div class="layui-form-mid layui-word-aux">参与活动获得积分</div>
                                        </div>
                                    </div>
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">成长值：</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="growthCnt" lay-verify="required"
                                                   placeholder="" autocomplete="off" class="layui-input">
                                            <div class="layui-form-mid layui-word-aux">参与活动获得成长值</div>
                                        </div>
                                    </div>
                                </div>

                                <div class="layui-row layui-col-space10 layui-form-item">
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">封面：</label>
                                        <div class="layui-input-block">
                                            <div class="layui-upload">

 src/main/resources/templates/febs/views/modules/votesActivity/discountUpdate.html

@@ -160,6 +160,26 @@
                                    </div>
                                </div>


                                <div class="layui-row layui-col-space10 layui-form-item">
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">积分：</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="scoreCnt" lay-verify="required"
                                                   placeholder="" autocomplete="off" class="layui-input">
                                            <div class="layui-form-mid layui-word-aux">参与活动获得积分</div>
                                        </div>
                                    </div>
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">成长值：</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="growthCnt" lay-verify="required"
                                                   placeholder="" autocomplete="off" class="layui-input">
                                            <div class="layui-form-mid layui-word-aux">参与活动获得成长值</div>
                                        </div>
                                    </div>
                                </div>

                                <div class="layui-row layui-col-space10 layui-form-item">
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">封面：</label>
@@ -381,6 +401,8 @@
                "surplusCnt": activity.surplusCnt,
                "voteCnt": activity.voteCnt,
                "addState": activity.addState,
                "growthCnt": activity.growthCnt,
                "scoreCnt": activity.scoreCnt,
            });
            $('#demoMax').append('<img src="' + activity.backImg + '" alt="" class="layui-upload-img single-image" style="width: 130px">');
            $("#backImg").val(activity.backImg);