modify

Helius

2020-06-17 0d125bc01e60e6bf22ac65efa4f17d70ec73d79d

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

@@ -229,14 +229,14 @@
        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 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);
@@ -413,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"));
@@ -438,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();
@@ -450,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"));
        }
@@ -608,11 +610,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);
        columnMap.put("symbolscoin_id", "2");
        List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol,memberId);
        List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol, memberId);
        MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
        List<MemberCoinAddressVo> arrayList = new ArrayList<>();
        if (CollUtil.isNotEmpty(selectByMap)) {
@@ -746,8 +744,6 @@

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

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