20221021

xiaoyong931011

2022-10-22 9cc3cf1059d45956f2def7b2b4beb7a112e85c85

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

@@ -36,6 +36,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -63,6 +65,8 @@
    private final DappNftActivationDao dappNftActivationDao;
    private final DappMemberService dappMemberService;
    private final MemberCoinWithdrawDao memberCoinWithdrawDao;

    private final RedisTemplate<String, Object> redisTemplate;

    @Override
    public WalletInfoVo walletInfo() {
@@ -494,9 +498,9 @@
        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        ApiMemberWalletCoinVo apiMemberWalletCoinVo = new ApiMemberWalletCoinVo();
        if(ObjectUtil.isNotEmpty(dappWalletCoinEntity)){
            apiMemberWalletCoinVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount().setScale(2,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setAvailableAmount(dappWalletCoinEntity.getAvailableAmount().setScale(2,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount().setScale(4,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setAvailableAmount(dappWalletCoinEntity.getAvailableAmount().setScale(4,BigDecimal.ROUND_DOWN));
        }
        return new FebsResponse().success().data(apiMemberWalletCoinVo);
    }
@@ -505,7 +509,7 @@
    @Transactional(rollbackFor = Exception.class)
    public FebsResponse transferInside(ApiTransferInsideDto apiTransferInsideDto) {
        //判断入参
        BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(2,BigDecimal.ROUND_DOWN);
        BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(4,BigDecimal.ROUND_DOWN);
        if(BigDecimal.ZERO.compareTo(balance) >= 0){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
        }
@@ -526,7 +530,7 @@
        Integer startTime = DateUtil.timeToSecond(startTimeDic.getValue());
        Integer endTime = DateUtil.timeToSecond(endTimeDic.getValue());
        if(startTime <= dateNow && endTime >= dateNow){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0012"));
        }


@@ -548,7 +552,8 @@
        }

        String inviteIdIn = memberEntityIn.getInviteId();
        Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
        Boolean isMemberIn = dappMemberService.isMember(inviteIdIn);
//        Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
        if(!isMemberIn){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
        }
@@ -580,7 +585,7 @@
        //查询转出会员
        //转出会员当前余额要大于等于划转金额
        DappWalletCoinEntity dappWalletCoinEntityOut = dappWalletCoinDao.selectByMemberId(memberIdOut);
        BigDecimal availableAmountOut = dappWalletCoinEntityOut.getAvailableAmount().setScale(2,BigDecimal.ROUND_DOWN);
        BigDecimal availableAmountOut = dappWalletCoinEntityOut.getAvailableAmount().setScale(4,BigDecimal.ROUND_DOWN);
        if(availableAmountOut.compareTo(balance) < 0){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
        }
@@ -694,6 +699,20 @@

    @Override
    public FebsResponse transferPassword(ApiTransferPasswordDto apiTransferPasswordDto) {
        DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
        Long memberId = dappMemberEntity.getId();

        if(ObjectUtil.isEmpty(apiTransferPasswordDto.getRealname())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
        }
        if(ObjectUtil.isEmpty(apiTransferPasswordDto.getPhone())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
        }
        if(ObjectUtil.isEmpty(apiTransferPasswordDto.getEmail())
                && ObjectUtil.isEmpty(apiTransferPasswordDto.getWahtsApp())
                && ObjectUtil.isEmpty(apiTransferPasswordDto.getTelegram())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
        }
        if(ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPassword())
                || ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
@@ -703,11 +722,19 @@
        if(!newTransferPassword.equals(newTransferPasswordAgain)){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
        }

        DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
        Long memberId = dappMemberEntity.getId();
        DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);

        String realname = apiTransferPasswordDto.getRealname();
        String phone = apiTransferPasswordDto.getPhone();
        String email = apiTransferPasswordDto.getEmail();
        String wahtsApp = apiTransferPasswordDto.getWahtsApp();
        String telegram = apiTransferPasswordDto.getTelegram();
        memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
        memberEntity.setRealname(realname);
        memberEntity.setPhone(phone);
        memberEntity.setEmail(email);
        memberEntity.setWahtsApp(wahtsApp);
        memberEntity.setTelegram(telegram);
        dappMemberDao.updateById(memberEntity);

        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -715,9 +742,41 @@

    @Override
    public FebsResponse updatePassword(ApiUpdatePasswordDto apiUpdatePasswordDto) {
        if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getOldTransferPassword())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_007"));
        //验证验证码是否正确
        // 根据前端传回的token在redis中找对应的value
        ValueOperations<String, Object> valueOperations = redisTemplate.opsForValue();
        if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getCodeToken()) || ObjectUtil.isEmpty(apiUpdatePasswordDto.getCodeValue())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_001"));
        }
        String codeToken = apiUpdatePasswordDto.getCodeToken();
        String codeValue = apiUpdatePasswordDto.getCodeValue();
        if (redisTemplate.hasKey(codeToken)) {
            //验证通过, 删除对应的key
            if (valueOperations.get(codeToken).equals(codeValue)) {
                redisTemplate.delete(codeToken);
            } else {
                return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_002"));
            }
        } else {
            return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_003"));
        }
        String username = apiUpdatePasswordDto.getUsername();
        DappMemberEntity memberEntity = dappMemberDao.selectMemberInfoByUsername(username);
        if (ObjectUtil.isEmpty(memberEntity)) {
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
        }

        String inviteIdIn = memberEntity.getInviteId();
        Boolean isMemberIn = dappMemberService.isMember(inviteIdIn);
        if(!isMemberIn){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
        }
        //验证资金密码
        Boolean aBoolean = dappMemberService.validateTransferCode(apiUpdatePasswordDto.getTransferCode(), memberEntity.getId());
        if(!aBoolean){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }

        if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPassword())
                || ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPasswordAgain())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
@@ -728,13 +787,39 @@
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
        }

        DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
        Long memberId = dappMemberEntity.getId();
        DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
        memberEntity.setPassword(SecureUtil.md5(apiUpdatePasswordDto.getNewTransferPassword()));
        dappMemberDao.updateById(memberEntity);

        String redisKey = AppContants.REDIS_KEY_SIGN + memberId;
        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
        redisUtils.del(redisKey);

        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
    }

    @Override
    public FebsResponse rebitTest() {
        return null;
    }

    @Override
    public FebsResponse resetPassword(ApiResetPasswordDto apiResetPasswordDto) {
        DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
        Long memberId = dappMemberEntity.getId();

        if(ObjectUtil.isEmpty(apiResetPasswordDto.getNewPassword())
                || ObjectUtil.isEmpty(apiResetPasswordDto.getNewPasswordAgain())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
        }
        String newPassword = apiResetPasswordDto.getNewPassword();
        String newPasswordAgain = apiResetPasswordDto.getNewPasswordAgain();
        if(!newPassword.equals(newPasswordAgain)){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
        }
        DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
        memberEntity.setPassword(SecureUtil.md5(apiResetPasswordDto.getNewPassword()));
        dappMemberDao.updateById(memberEntity);

        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
        redisUtils.del(redisKey);

        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));