20200608 代码提交

xiaoyong931011

2020-06-08 c326372b71da84c449b6097af5e281cd6fb46e2c

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

@@ -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);
@@ -878,6 +885,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("");
    }

}