KKSU
2024-03-15 b87c5549fe471167882192944db3f2d6b729476c
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -771,22 +771,28 @@
         * 每次拿重试次数大于零
         * 按ID asc排序的十条数据
         */
        List<MallMqRecord> mallMqRecords = mallMqRecordMapper.selectByStateLimitTen(2);
        if(CollUtil.isEmpty(mallMqRecords)){
            return;
        }
        for(MallMqRecord mallMqRecord : mallMqRecords){
            Integer retryTimes = mallMqRecord.getRetryTimes();
            if(retryTimes <= 0){
                continue;
            }
            retryTimes = retryTimes - 1;
            mallMqRecord.setRetryTimes(retryTimes);
            mallMqRecordMapper.updateById(mallMqRecord);
            Long orderId = mallMqRecord.getOrderId();
            agentProducer.sendPerkMoneyMsg(orderId);
        }
//        List<MallMqRecord> mallMqRecords = mallMqRecordMapper.selectByStateLimitTen(2);
//        if(CollUtil.isEmpty(mallMqRecords)){
//            return;
//        }
//        DateTime dateTime = DateUtil.offsetMinute(new Date(), -5);
//        for(MallMqRecord mallMqRecord : mallMqRecords){
//            if(DateUtil.compare(dateTime,mallMqRecord.getCreateTime()) <= 0){
//                continue;
//            }
//            Integer retryTimes = mallMqRecord.getRetryTimes();
//            if(retryTimes <= 0){
//                continue;
//            }
//            retryTimes = retryTimes - 1;
//            mallMqRecord.setRetryTimes(retryTimes);
//            mallMqRecordMapper.updateById(mallMqRecord);
//
//            Long orderId = mallMqRecord.getOrderId();
//            if(mallMqRecord.getState() == 2){
//                agentProducer.sendPerkMoneyMsg(orderId);
//            }
//        }
    }
    @Override
@@ -813,7 +819,8 @@
        for(MallScoreRecord mallScoreRecord : mallScoreRecords){
            Long memberId = mallScoreRecord.getMemberId();
            //每日释放的绿色凭证数量 = 总数 * 释放比例
            BigDecimal scoreCnt = mallScoreRecord.getScoreCnt();
//            BigDecimal scoreCnt = mallScoreRecord.getScoreCnt();
            BigDecimal scoreCnt = mallScoreRecord.getSurplusCnt();
            BigDecimal scoreReleaseCnt = scoreCnt.multiply(roleReleasePercent).setScale(2,BigDecimal.ROUND_DOWN);
            BigDecimal surplusCnt = mallScoreRecord.getSurplusCnt();
@@ -893,8 +900,8 @@
        /**
         * 20%给合伙人、联创
         *  5% 给联创
         *  15% 给合伙人
         *  5% 给联创 10%
         *  15% 给合伙人 10%
         */
        DataDictionaryCustom roleAchievePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.ROLE_ACHIEVE_PERCENT.getType(),
@@ -908,7 +915,8 @@
        List<MallMember> roleAchieveReleaseMembers = mallMemberMapper.selectByRole(3,1);
        if(CollUtil.isNotEmpty(roleAchieveReleaseMembers)){
            //联创拿走0.25
            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.25));
//            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.25));
            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.5));
            BigDecimal memberAchieveRelease = multiply.divide(new BigDecimal(roleAchieveReleaseMembers.size()), 2, BigDecimal.ROUND_DOWN);
            if(memberAchieveRelease.compareTo(BigDecimal.ZERO) > 0){
                for(MallMember mallMember : roleAchieveReleaseMembers){
@@ -924,7 +932,8 @@
        List<MallMember> roleAchieveReleaseHHR = mallMemberMapper.selectByRole(4,1);
        if(CollUtil.isNotEmpty(roleAchieveReleaseHHR)){
            //合伙人拿走0.75
            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.75));
//            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.75));
            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.5));
            BigDecimal memberAchieveReleaseHHR = multiply.divide(new BigDecimal(roleAchieveReleaseHHR.size()), 2, BigDecimal.ROUND_DOWN);
            if(memberAchieveReleaseHHR.compareTo(BigDecimal.ZERO) > 0){
                for(MallMember mallMember : roleAchieveReleaseHHR){
@@ -1080,7 +1089,7 @@
                            voucherAmountAdd,
                            MoneyFlowTypeEnum.VOUCHER_SALE.getValue(),
                            voucherNo,
                            FlowTypeEnum.VOUCHER_AMOUNT.getValue());
                            FlowTypeEnum.BALANCE.getValue());
                }
                //增加积分凭证池的凭证数量