modify

Helius

2020-07-01 bb3f7735812279b7154bc587d4e998d5262d6f1f

 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());
@@ -340,16 +344,19 @@
                return Result.fail(MessageSourceUtils.getString("member_service_0059"));
            }
            memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());

            
            String type = memberAuthenticationDto.getType();
            memberAuthenticationEntity.setType(type);
            
            String idCardNo = memberAuthenticationDto.getIdCardNo();
            if (StrUtil.isBlank(idCardNo)) {
                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
               return Result.fail(MessageSourceUtils.getString("member_service_0060"));
            }
            memberAuthenticationEntity.setIdcardNo(idCardNo);
            //同一个身份证号码不能重复实名认证
            int count = memberAuthenticationDao.findMemberbyIdCardNoCount(idCardNo);
            if (count > 0) {
                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
               return Result.fail(MessageSourceUtils.getString("member_service_0060"));
            }
            if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
                    || StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
@@ -459,6 +466,17 @@
        if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
            return Result.fail(MessageSourceUtils.getString("member_service_0077"));
        }
        
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", memberId);
      List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
      if(CollUtil.isNotEmpty(selectByMap)) {
         for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
            if(memberPaymethodDto.getAccount().equals(memberPaymentMethodEntity.getAccount())) {
               return Result.fail(MessageSourceUtils.getString("member_service_0097"));
            }
         }
      }
        String account = memberPaymethodDto.getAccount();
        String bank = memberPaymethodDto.getBank();
        String name = memberPaymethodDto.getName();
@@ -688,6 +706,7 @@
                memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
                memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
                memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
                memberAuthnticationInfoVo.setType(memberAuthenticationEntity.getType());
            }
        }
        return Result.ok(memberAuthnticationInfoVo);
@@ -860,7 +879,7 @@
                 */
                return Result.ok(MessageSourceUtils.getString("member_service_0086"));
            } else {
                return Result.fail(MessageSourceUtils.getString("order_service_0040"));
                return Result.fail(MessageSourceUtils.getString("member_service_0038"));
            }

        } else {
@@ -887,19 +906,20 @@

   @Override
   public Result getAppVersionInfo() {
      Map<String, Object> columnMap = new HashMap<>();
      List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
      AppVersionVo appVersionVo = new AppVersionVo();
   Map<String, Object> columnMap = new HashMap<>();
   List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
   List<Object> arrayList = new ArrayList<>(); 
      if(CollUtil.isNotEmpty(selectByMap)) {
         for(AppVersionEntity appVersionEntity : selectByMap) {
            appVersionVo.setAddress(appVersionEntity.getAddress());
            appVersionVo.setType(appVersionEntity.getType());
            appVersionVo.setVersion(appVersionEntity.getVersion());
               AppVersionVo appVersionVo = new AppVersionVo();
               appVersionVo.setAddress(appVersionEntity.getAddress());
               appVersionVo.setType(appVersionEntity.getType());
               appVersionVo.setVersion(appVersionEntity.getVersion());
               arrayList.add(appVersionVo);
            }
         }
      }
      return Result.ok(appVersionVo);
   return Result.ok(arrayList);
   }

}