20200612 代码提交

xiaoyong931011

2020-06-12 c7d94b1950e630b0fef5ea4c2cb2a6af92c8d140

 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);
@@ -601,10 +608,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 +742,6 @@

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

        MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
        List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());