20200618 代码提交

xiaoyong931011

2020-06-18 254973f19bf7569a60d17ed6aa9eee2c9c9d71a3

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -149,7 +149,7 @@
        member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
        member.setAccountType(registerDto.getType());
        member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
        member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
        member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
        member.setIsForce(0);
        member.setIsProfit(0);
        memberDao.insert(member);
@@ -229,7 +229,14 @@
        MemberEntity memberEntity = memberDao.selectById(memberId);
        MemberInfoVo memberInfoVo = new MemberInfoVo();
        if (ObjectUtil.isNotEmpty(memberEntity)) {
            memberInfoVo.setPhone(memberEntity.getPhone());
            String email = memberEntity.getEmail();
            String phone = memberEntity.getPhone();
            if (StrUtil.isNotEmpty(phone)) {
                memberInfoVo.setPhone(phone);
            } else if (StrUtil.isNotEmpty(email)) {
                memberInfoVo.setPhone(email);
            }

            memberInfoVo.setInviteId(memberEntity.getInviteId());
        }
        return Result.ok(memberInfoVo);
@@ -406,6 +413,7 @@
        if (flag) {
            memberEntity.setTradePassword(SecureUtil.md5(password));
            memberDao.updateById(memberEntity);
            LoginUserUtils.resetAppLoginUser(memberEntity);
            return Result.ok(MessageSourceUtils.getString("member_service_0051"));
        }
        return Result.fail(MessageSourceUtils.getString("member_service_0045"));
@@ -431,8 +439,7 @@
    @Transactional
    public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity memberEntity = memberDao.selectById(memberId);
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();

        String code = memberForgetPwdDto.getCode();
        String password = memberForgetPwdDto.getPassword();
@@ -443,6 +450,8 @@
        if (flag) {
            memberEntity.setTradePassword(SecureUtil.md5(password));
            memberDao.updateById(memberEntity);
            // 重置内存中的用户信息
            LoginUserUtils.resetAppLoginUser(memberEntity);
        } else {
            return Result.fail(MessageSourceUtils.getString("member_service_0015"));
        }
@@ -546,13 +555,9 @@
        String code = memberBindPhoneDto.getCode();

        MemberEntity member = memberDao.selectById(memberId);
        String smsCode = redisUtils.get("SMS_" + phone) + "";

        if (ObjectUtil.isNotEmpty(member)) {
            if (StrUtil.isEmpty(smsCode)) {
                return Result.fail(MessageSourceUtils.getString("member_service_0038"));
            }
            if (!smsCode.equals(code)) {
            if (!commonservice.verifyCode(phone, code)) {
                return Result.fail(MessageSourceUtils.getString("member_service_0013"));
            }
            member.setPhone(phone);
@@ -601,10 +606,7 @@
    public Result memberCoinAddressList(String symbol) {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", memberId);
        columnMap.put("symbol", symbol);
        List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
        List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol, memberId);
        MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
        List<MemberCoinAddressVo> arrayList = new ArrayList<>();
        if (CollUtil.isNotEmpty(selectByMap)) {
@@ -738,8 +740,6 @@

    @Override
    public Result memberCoinInfoList() {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
        List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
@@ -878,6 +878,23 @@
        }
    }

    @Override
    public Result getMemberAccountInfo(String account, int type) {

        Map<String, Object> hashMap = new HashMap<>();
        if (type == 1) {
            hashMap.put("phone", account);
        } else {
            hashMap.put("email", account);
        }
        List<MemberEntity> member = memberDao.selectByMap(hashMap);
        if (CollUtil.isEmpty(member)) {
            return Result.fail(MessageSourceUtils.getString("home_service_0003"));
        }

        return Result.ok("");
    }

}