修改我的

renren-admin/src/main/java/io/renren/modules/qmgj/api/MemberUtils.java

@@ -15,39 +15,10 @@ public class MemberUtils {
         if(memberInfoEntity.getVipname()==null || "".equals(memberInfoEntity.getVipname())){
             throw new RRException("请完善昵称资料");
         }
-        if(memberInfoEntity.getCardno()==null || "".equals(memberInfoEntity.getCardno())){
-            throw new RRException("请完善会员卡号资料");
-        }
+
         if(memberInfoEntity.getMemberphoto()==null || "".equals(memberInfoEntity.getMemberphoto())){
             throw new RRException("请完善会员头像资料");
         }
-        if(memberInfoEntity.getHeight()==null || "".equals(memberInfoEntity.getHeight())){
-            throw new RRException("请完善身高资料");
-        }
-        if(memberInfoEntity.getWeighttype()==null || "".equals(memberInfoEntity.getWeighttype())){
-            throw new RRException("请完善体重类型资料");
-        }
-        if(memberInfoEntity.getDormitoryno()==null || "".equals(memberInfoEntity.getDormitoryno())){
-            throw new RRException("请完善宿舍号资料");
-        }
-        if(memberInfoEntity.getIdcard()==null || "".equals(memberInfoEntity.getIdcard())){
-            throw new RRException("请完善身份证号资料");
-        }
-        if(memberInfoEntity.getBirthday()==null || "".equals(memberInfoEntity.getBirthday())){
-            throw new RRException("请完善生日资料");
-        }
-        if(memberInfoEntity.getFreetime()==null || "".equals(memberInfoEntity.getFreetime())){
-            throw new RRException("请完善本周空闲时间资料");
-        }
-        if(memberInfoEntity.getSkill()==null || "".equals(memberInfoEntity.getSkill())){
-            throw new RRException("请完善其他技能资料");
-        }
-        if(memberInfoEntity.getIshealth()==null || "".equals(memberInfoEntity.getIshealth())){
-            throw new RRException("请完善健康证有否资料");
-        }
-        if(memberInfoEntity.getRemarks()==null || "".equals(memberInfoEntity.getRemarks())){
-            throw new RRException("请完善备注资料");
-        }
 //        if(memberInfoEntity.getEmail()==null || "".equals(memberInfoEntity.getEmail())){
 //            return R.error(503,"邮箱信息不全!");
 //        }

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/MemberInfoServiceImpl.java

@@ -1419,7 +1419,7 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
         List<String> fieldList =  Arrays.asList(
                 member.getMemberphoto(), member.getName(),member.getVipname(), member.getSex(),
                 member.getCardno(), member.getHeight(), member.getWeighttype(), member.getDormitoryno(), member.getIdcard(), member.getBirthday(),
-                member.getFreetime(), member.getSkill(), member.getIshealth(), member.getRemarks(), member.getLng()
+                member.getFreetime(), member.getSkill(), member.getIshealth(), member.getRemarks()
         );
         return fieldList.stream()
                 .filter(field -> field != null && !field.trim().isEmpty())

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/ApiAuthServiceImpl.java

@@ -204,12 +204,12 @@ public class ApiAuthServiceImpl implements ApiAuthService {
         String mobileCaptcha = redisUtils.get("SmsCode:" + mobile);
         String shortMessageCode = dto.getShortMessageCode();
         //todo 暂时注释掉
-       //if (StrUtil.isNotBlank(shortMessageCode)) {
-       //    if (!StrUtil.equals(mobileCaptcha, shortMessageCode)) {
-       //        throw new RRException("短信验证码失效");
-       //    }
-       //    redisUtils.delete("SmsCode:" + mobile);
-       //}
+       if (StrUtil.isNotBlank(shortMessageCode)) {
+           if (!StrUtil.equals(mobileCaptcha, shortMessageCode)) {
+               throw new RRException("短信验证码失效");
+           }
+           redisUtils.delete("SmsCode:" + mobile);
+       }
 
         String inviteCode = dto.getInviteCode();
         MemberInfoEntity memberInfoInviteCode = null;
@@ -244,12 +244,12 @@ public class ApiAuthServiceImpl implements ApiAuthService {
             memberinfo.setSex(dto.getSex());
             memberinfo.setCreateTime(LocalDateTime.now());
             memberinfo.setUpdateTime(LocalDateTime.now());
-            String carNo = "WJ" + GetVIPNoTool.getRandomFileName();
+            String carNo = "QYH" + GetVIPNoTool.getRandomFileName();
             boolean falg = false;
             while (!falg) {
                 MemberInfoEntity memberInfoEntityCarNo = memberInfoService.selectByCardNo(carNo);
                 if (memberInfoEntityCarNo != null) {
-                    carNo = "WJ" + GetVIPNoTool.getRandomFileName();
+                    carNo = "QYH" + GetVIPNoTool.getRandomFileName();
                     falg = false;
                 } else {
                     falg = true;