20201125

xiaoyong931011

2020-11-25 c496fc3162bbd0c1219110df02611ac1433a1403

20201125

 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberInfoVo.java

@@ -9,10 +9,10 @@
public class MemberInfoVo {

    

    /**

     * 手机号(包含国际手机号)

     * 名称

     */

    @ApiModelProperty(value = "手机号(包含国际手机号)")

    private String phone;

    @ApiModelProperty(value = "名称")

    private String walletName;



    /**

     * 邀请码


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

@@ -275,17 +275,15 @@
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity memberEntity = memberDao.selectById(memberId);
        MemberInfoVo memberInfoVo = new MemberInfoVo();
        
        if (ObjectUtil.isNotEmpty(memberEntity)) {
            String email = memberEntity.getEmail();
            String phone = memberEntity.getPhone();
            if (StrUtil.isNotEmpty(phone)) {
                memberInfoVo.setPhone(phone);
            } else if (StrUtil.isNotEmpty(email)) {
                memberInfoVo.setPhone(email);
            }

            String address = memberEntity.getAddress();
            WtWallet wtWallet = wtWalletDao.selectSimpleById(address);
            String walletName = wtWallet.getWalletName();
            memberInfoVo.setWalletName(walletName);
            memberInfoVo.setInviteId(memberEntity.getInviteId());
        }
        
        return Result.ok(memberInfoVo);
    }

@@ -493,7 +491,7 @@
            return Result.fail(MessageSourceUtils.getString("member_service_0003"));
        }
        String token = LoginUserUtils.getAppLoginUserToken();
        redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
        redisUtils.del(token);
        SecurityContextHolder.clearContext();
        return Result.ok(MessageSourceUtils.getString("member_service_0071"));
    }