Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/LoginServiceImpl.java

@@ -50,7 +50,7 @@ public class LoginServiceImpl implements LoginService {
         //1、检验验证码是否正确
         String key = "";
         String redisCode = redisUtils.getValue(key);
-        if (!userVo.getSms().equals(redisCode) || StringUtils.isBlank(redisCode)) {
+        if (StringUtils.isBlank(redisCode) || !userVo.getSms().equals(redisCode)) {
             return R.error("验证码错误!");
         }
 
@@ -67,6 +67,8 @@ public class LoginServiceImpl implements LoginService {
         user.setUserLevel(0);
         String inviteCode = ShareCodeUtil.idToCode(Long.parseLong(userVo.getUserId()));
         user.setInviteCode(inviteCode);
+
+        //4、判断邀请人邀请码是否存在 否：直接初始化用户信息 存：计算当前用户的直推上级 +1
         if (StringUtils.isBlank(userVo.getBeInvitedCode())) {
             user.setBeInvitedCode("1");
             List<TeamUserInfo> list = new ArrayList<>();