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;
@@ -48,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;
@@ -57,6 +60,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 +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的集合
@@ -552,7 +568,11 @@
        happyActivityOrder.setNumCnt(dto.getNumCnt());
        happyActivityOrder.setAmount(amount);
        happyActivityOrder.setPayState(StateUpDownEnum.PAY_STATE_NOT_PAY.getCode());
        happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
        if(BigDecimal.ZERO.compareTo(amount) == 0){
            happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_NO_PAY.getCode());
        }else{
            happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
        }
        happyActivityOrder.setFailTime(failTime);
        log.info("创建订单,订单号="+JSONUtil.parse(happyActivityOrder));
        happyActivityOrderMapper.insert(happyActivityOrder);
@@ -578,6 +598,7 @@
        HashMap<String, Object> stringObjectHashMap = new HashMap<>();
        stringObjectHashMap.put("orderId",happyActivityOrder.getId());
        stringObjectHashMap.put("amount",amount);
        stringObjectHashMap.put("payType",happyActivityOrder.getPayType());
        stringObjectHashMap.put("failTime",failTime);
        return new FebsResponse().success().data(stringObjectHashMap);
@@ -619,6 +640,7 @@
        try {
            // 根据支付类型处理不同的支付逻辑
            if (StateUpDownEnum.PAY_METHOD_NO_PAY.getCode() == payType) {
//            if (BigDecimal.ZERO.compareTo(happyActivityOrder.getAmount()) == 0) {
                // 处理无需支付的订单逻辑
                processNoPayOrder(happyActivityOrder, orderId);
            } else if (StateUpDownEnum.PAY_METHOD_WECHAT.getCode() == payType) {
@@ -902,7 +924,7 @@
                .last("limit 1")
        );
        if(happyActivityOrderItem == null){
            throw new FebsException("票号异常!");
            throw new FebsException("票号不存在!");
        }
        HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
@@ -938,16 +960,77 @@
                        .eq(HappyActivityOrderItem::getCode, orderItemCode)
                        .last("limit 1")
        );
        if(happyActivityOrderItem != null){
            if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
                throw new FebsException("票号已核销!");
            }
            happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
            happyActivityOrderItem.setTransferItemId(memberId);
            happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
            agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
        if(happyActivityOrderItem == null){
            throw new FebsException("票号不存在!");
        }
        if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
            throw new FebsException("票号已核销!");
        }
        happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
        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("操作成功");
    }
@@ -959,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>()