parent: 29bf82ef | patch | commit | show whitespace
KKSU
2024-05-11 74cae02c58eb057e6f9422038d5b3ed30b7c9a2f 
香港新环境
2 files modified
31 ■■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java 17 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java 14 ●●●●● patch | view | raw | blame | history 
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java


@@ -5,13 +5,14 @@


import cc.mrbird.febs.common.entity.QueryRequest;


import cc.mrbird.febs.common.exception.FebsException;


import cc.mrbird.febs.common.utils.*;


import cc.mrbird.febs.dapp.chain.ChainEnum;


import cc.mrbird.febs.dapp.chain.ChainService;


import cc.mrbird.febs.dapp.chain.ContractChainService;


import cc.mrbird.febs.dapp.contract.andao.AndaoContractMain;


import cc.mrbird.febs.dapp.dto.*;


import cc.mrbird.febs.dapp.entity.*;


import cc.mrbird.febs.dapp.enumerate.*;


import cc.mrbird.febs.dapp.enumerate.AccountFlowEnum;


import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;


import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;


import cc.mrbird.febs.dapp.enumerate.MemberLevelEnum;


import cc.mrbird.febs.dapp.mapper.*;


import cc.mrbird.febs.dapp.service.DappMemberService;


import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;


@@ -19,7 +20,6 @@


import cc.mrbird.febs.rabbit.producer.ChainProducer;


import cc.mrbird.febs.system.entity.User;


import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.date.DateTime;


import cn.hutool.core.date.DateUtil;


import cn.hutool.core.util.ObjectUtil;


import cn.hutool.core.util.StrUtil;


@@ -30,13 +30,10 @@


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import lombok.RequiredArgsConstructor;


import org.apache.commons.lang3.StringUtils;


import org.jsoup.helper.DataUtil;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.web3j.utils.Strings;




import java.math.BigDecimal;


import java.math.BigInteger;


import java.util.*;


import java.util.stream.Collectors;




@@ -834,8 +831,8 @@


        /**


         * todo 发送一条订单出的消息


         */


        chainProducer.sendSpeedPayOrderMsg(id);


        chainProducer.sendAutoLevelUpTeamMsg(member.getId());


//        chainProducer.sendSpeedPayOrderMsg(id);


//        chainProducer.sendAutoLevelUpTeamMsg(member.getId());


    }




    @Override


@@ -899,7 +896,7 @@


        dappMemberEntity.setBalance(subtract);


        dappMemberDao.updateById(dappMemberEntity);




        chainProducer.sendSalePackageMsg(scoreFlow.getId());


//        chainProducer.sendSalePackageMsg(scoreFlow.getId());


        return new FebsResponse().success();


    }






 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java


@@ -1,17 +1,14 @@


package cc.mrbird.febs.dapp.service.impl;




import cc.mrbird.febs.common.contants.AppContants;


import cc.mrbird.febs.common.exception.FebsException;


import cc.mrbird.febs.common.tree.MatrixTree;


import cc.mrbird.febs.common.tree.MemberNode;


import cc.mrbird.febs.common.utils.LoginUserUtil;


import cc.mrbird.febs.common.utils.RedisUtils;


import cc.mrbird.febs.common.utils.SpringContextUtil;


import cc.mrbird.febs.dapp.chain.ChainEnum;


import cc.mrbird.febs.dapp.chain.ChainService;


import cc.mrbird.febs.dapp.contract.ContractMain;


import cc.mrbird.febs.dapp.dto.SystemDto;


import cc.mrbird.febs.dapp.dto.TransferDto;


import cc.mrbird.febs.dapp.entity.*;


import cc.mrbird.febs.dapp.enumerate.*;


import cc.mrbird.febs.dapp.mapper.*;


@@ -25,25 +22,18 @@


import cn.hutool.core.date.DateTime;


import cn.hutool.core.date.DateUnit;


import cn.hutool.core.date.DateUtil;


import cn.hutool.core.date.Week;


import cn.hutool.core.util.ObjectUtil;


import cn.hutool.core.util.StrUtil;


import cn.hutool.json.JSONUtil;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.jline.utils.Log;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.web3j.utils.Convert;




import java.math.BigDecimal;


import java.math.BigInteger;


import java.math.RoundingMode;


import java.util.*;


import java.util.concurrent.locks.Lock;


import java.util.concurrent.locks.ReentrantLock;


import java.util.stream.Collectors;




/**


@@ -3053,7 +3043,7 @@


                dappAccountMoneyChangeDao.insert(record);




                //实时更新用户等级


                chainProducer.sendAutoLevelUpTeamMsg(memberId);


//                chainProducer.sendAutoLevelUpTeamMsg(memberId);




                set.add(dappMemberEntity);


                continue;


@@ -3216,7 +3206,7 @@


            dappAccountMoneyChangeDao.insert(record);




            //实时更新用户等级


            chainProducer.sendAutoLevelUpTeamMsg(memberId);


//            chainProducer.sendAutoLevelUpTeamMsg(memberId);




            set.add(dappMemberEntity);


        }