Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-02 d564d6930e956631f6219d5cf477a12e67b8da95

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

@@ -320,6 +320,9 @@
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity member = memberDao.selectById(memberId);
      if(MemberEntity.CERTIFY_STATUS_ING.equals(member.getCertifyStatus())) {
         return Result.fail(MessageSourceUtils.getString("member_service_4000"));
      }
        if (ObjectUtil.isNotEmpty(member)) {
            MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
            if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
@@ -557,7 +560,7 @@
    @Override
    @Transactional
    public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
        //获取用户ID
       //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        String phone = memberBindPhoneDto.getPhone();
        String code = memberBindPhoneDto.getCode();
@@ -568,9 +571,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"));
@@ -580,7 +590,7 @@
    @Transactional
    public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {

        //获取用户ID
       //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        String email = memberBindEmailDto.getEmail();
        String code = memberBindEmailDto.getCode();
@@ -589,9 +599,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"));
@@ -719,6 +736,19 @@
        MemberEntity member = memberDao.selectById(memberId);

        MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
        
        Integer certifyStatus = member.getCertifyStatus();
        memberPersonCenterInfoVo.setCertifyStatus(certifyStatus);
        
        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 {
@@ -879,7 +909,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 {