20221021

xiaoyong931011

2022-10-26 f1474f682d2bf0ed2eeb78d94287d45844700c06

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

@@ -28,6 +28,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -67,6 +68,7 @@
    private final DappBankDao dappBankDao;
//    private final DappMemberService dappMemberService;
    private final DappMemberAddressDao dappMemberAddressDao;
    private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;

    private final RedisTemplate<String, Object> redisTemplate;

@@ -206,8 +208,11 @@
    public IPage<DappMemberEntity> selectInPage(DappMemberEntity member, QueryRequest request) {
        Page<DappMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        User currentUser = FebsUtil.getCurrentUser();
        if (currentUser.getDeptId() == null) {
            member.setCurrentUser(currentUser.getUserId());
//        if (currentUser.getDeptId() == null) {
//            member.setCurrentUser(currentUser.getUserId());
//        }
        if(StrUtil.isNotEmpty(currentUser.getDescription())){
            member.setDescription(currentUser.getDescription());
        }
        return dappMemberDao.selectInPage(member, page);
    }
@@ -418,6 +423,8 @@
        member.setPassword(SecureUtil.md5(registerDto.getPassword()));
        member.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
        member.setRefererId(registerDto.getRefererId());
        member.setIsOnHook(2);
        member.setIsProfit(1);
        dappMemberDao.insert(member);

        //更新用户信息
@@ -445,6 +452,7 @@
        dappWalletCoinEntity.setAvailableAmount(AppContants.INIT_MONEY);
        dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
        dappWalletCoinEntity.setTotalAmount(AppContants.INIT_MONEY);
        dappWalletCoinEntity.setWalletCode("USDT");
        dappWalletCoinDao.insert(dappWalletCoinEntity);

        return new FebsResponse().success().message(MessageSourceUtils.getString("register_err_006"));
@@ -514,6 +522,8 @@
            dappMemberEntity = new DappMemberEntity();
            dappMemberEntity.setTouristMark(touristMark);
            dappMemberEntity.setIdentity(DataDictionaryEnum.LEVEL_TM.getCode());
            dappMemberEntity.setIsOnHook(2);
            dappMemberEntity.setIsProfit(1);
            dappMemberDao.insert(dappMemberEntity);

            //初始化账户信息
@@ -599,6 +609,10 @@
        }
        int isOnHook = dappMemberEntity.getIsOnHook() == null ? 2 : dappMemberEntity.getIsOnHook();
        memberInfoVo.setIsOnHook(isOnHook);


        BigDecimal totalProfit = igtOnHookPlanOrderDao.selectSumProfitByMemberId(memberId);
        memberInfoVo.setTotalProfit(totalProfit.setScale(4,BigDecimal.ROUND_DOWN));

        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        if(ObjectUtil.isEmpty(dappMemberEntity)){
@@ -920,4 +934,6 @@
        RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
        return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
    }


}