fix

Hentua

2024-01-29 1b35365d019f89927ed5f68b568f6f7de998278d

fix

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

@@ -725,7 +725,7 @@
        }

        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
        if (CollUtil.isNotEmpty(configs)) {
        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
            MallVipConfig mallVipConfig = configs.get(0);
            mallMember.setLevel(mallVipConfig.getCode());
        }

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

@@ -453,7 +453,6 @@
                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);

                agentProducer.sendOrderCoupon(orderInfo.getId());
                agentProducer.sendGetScoreMsg(orderInfo.getId());
                break;
            case "4":
                if (orderInfo.getOrderType() != 2) {
@@ -583,8 +582,7 @@
        orderInfo.setReceivingTime(new Date());
        this.baseMapper.updateById(orderInfo);

        agentProducer.sendVipLevelUp(orderInfo.getId());

        agentProducer.sendGetScoreMsg(orderInfo.getId());
        //生成一条团长提成记录
//        Long orderInfoId = orderInfo.getId();
//        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);

 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java

@@ -327,7 +327,7 @@
                            mallOrderInfoMapper.updateById(order);

                            agentProducer.sendOrderCoupon(order.getId());
                            agentProducer.sendGetScoreMsg(order.getId());
//                            agentProducer.sendGetScoreMsg(order.getId());

                            mallMoneyFlowService.addMoneyFlow(
                                    order.getMemberId(),

 src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java

@@ -11,6 +11,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cc.mrbird.febs.vip.entity.MallVipBenefits;
import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.mapper.MallVipConfigMapper;
@@ -41,6 +42,7 @@
    private final IApiMallMemberWalletService mallMemberWalletService;
    private final MallMemberMapper mallMemberMapper;
    private final MallVipConfigMapper mallVipConfigMapper;
    private final AgentProducer agentProducer;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -67,6 +69,8 @@

        mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), CollUtil.join(skuNames, ","), 2);
        mallMemberWalletService.add(new BigDecimal(score), memberId, "prizeScore");

        agentProducer.sendVipLevelUp(orderId);
    }

    @Override