From 7f5953fc973d65cc5d2bd496dda344fe1c6a97c8 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 02 Jul 2020 17:57:31 +0800 Subject: [PATCH] 20200702 代码提交 --- src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java index 364b1b3..56ace36 100644 --- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java @@ -122,17 +122,21 @@ member.setPassword(SecureUtil.md5(registerDto.getPassword())); // 判断账号类型 - if (MemberEntity.ACCOUNT_TYPE_PHONE == registerDto.getType()) { + if (MemberEntity.ACCOUNT_TYPE_PHONE.equals(registerDto.getType())) { member.setPhone(registerDto.getAccount()); - } else if (MemberEntity.ACCOUNT_TYPE_EMAIL == registerDto.getType()) { + } else if (MemberEntity.ACCOUNT_TYPE_EMAIL.equals(registerDto.getType())) { member.setEmail(registerDto.getAccount()); } else { return Result.fail("账号类型错误"); } // 判断是否拥有推荐人,若为空则默认系统 - if (StrUtil.isBlank(registerDto.getRefererId())) { - registerDto.setRefererId(AppContants.SYSTEM_REFERER); +// if (StrUtil.isBlank(registerDto.getRefererId())) { +// registerDto.setRefererId(AppContants.SYSTEM_REFERER); +// } + MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId()); + if (isExist == null) { + return Result.fail("推荐人不存在"); } member.setRefererId(registerDto.getRefererId()); @@ -553,7 +557,7 @@ @Override @Transactional public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) { - //获取用户ID + //获取用户ID Long memberId = LoginUserUtils.getAppLoginUser().getId(); String phone = memberBindPhoneDto.getPhone(); String code = memberBindPhoneDto.getCode(); @@ -564,9 +568,16 @@ if (!commonservice.verifyCode(phone, code)) { return Result.fail(MessageSourceUtils.getString("member_service_0013")); } - member.setPhone(phone); - memberDao.updateById(member); - return Result.ok(MessageSourceUtils.getString("member_service_0014")); + Map<String, Object> columnMap = new HashMap<>(); + columnMap.put("phone", phone); + List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap ); + if(CollUtil.isEmpty(selectByMap)) { + member.setPhone(phone); + memberDao.updateById(member); + return Result.ok(MessageSourceUtils.getString("member_service_0014")); + }else { + return Result.fail(MessageSourceUtils.getString("member_service_1400")); + } } return Result.fail(MessageSourceUtils.getString("member_service_0015")); @@ -576,7 +587,7 @@ @Transactional public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) { - //获取用户ID + //获取用户ID Long memberId = LoginUserUtils.getAppLoginUser().getId(); String email = memberBindEmailDto.getEmail(); String code = memberBindEmailDto.getCode(); @@ -585,9 +596,16 @@ boolean flag = commonservice.verifyCode(email, code); if (ObjectUtil.isNotEmpty(member)) { if (flag) { - member.setEmail(email); - memberDao.updateById(member); - return Result.ok(MessageSourceUtils.getString("member_service_0018")); + Map<String, Object> columnMap = new HashMap<>(); + columnMap.put("email", email); + List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap ); + if(CollUtil.isEmpty(selectByMap)) { + member.setEmail(email); + memberDao.updateById(member); + return Result.ok(MessageSourceUtils.getString("member_service_0018")); + }else { + return Result.fail(MessageSourceUtils.getString("member_service_1400")); + } } } return Result.fail(MessageSourceUtils.getString("member_service_0019")); @@ -715,6 +733,16 @@ MemberEntity member = memberDao.selectById(memberId); MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo(); + + Map<String, Object> columnMap = new HashMap<>(); + columnMap.put("member_id", memberId); + List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap); + if(CollUtil.isEmpty(selectByMap)) { + memberPersonCenterInfoVo.setMemberPaymentMethod(0); + }else { + memberPersonCenterInfoVo.setMemberPaymentMethod(1); + } + if (StrUtil.isNotEmpty(member.getPhone())) { memberPersonCenterInfoVo.setPhone(1); } else { @@ -875,7 +903,7 @@ */ return Result.ok(MessageSourceUtils.getString("member_service_0086")); } else { - return Result.fail(MessageSourceUtils.getString("member_service_0038")); + return Result.fail(MessageSourceUtils.getString("member_service_0005")); } } else { -- Gitblit v1.9.1