123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -216,8 +216,6 @@ public class AppPermissionService {
     public JSONObject register(String username, String password, String headimgurl,
                                String nickname, String mobilecode, String openId, String unionid, Integer type,String code) {
         String activityCode = null;
-        String inviterCode = null;
-
         // 判断参数和验证码
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
@@ -272,17 +270,16 @@ public class AppPermissionService {
             setCreateIPInfo(rsUserDetail);
             //邀请人id关系绑定
             Integer parentId=0;
-            String code1=null;
             if (StringUtils.isNotBlank(code)){
                 //判断处理活动关键字
                 String[] codes = code.split("_");
                 if(codes.length > 1) {
+                    code = codes[0];
                     activityCode = codes[1];
-                    inviterCode = codes[0];
-                    parentId=appUserDetailBiz.getUserByCode(inviterCode);
                 }
+                parentId=appUserDetailBiz.getUserByCode(code);
             }
-            if(parentId!=null&&parentId>0){
+            if(parentId!=null&&parentId>0&&StringUtils.isNotBlank(activityCode)){
                 rsUserDetail.setInviterAccount(parentId);
             }
             //生成邀请码 长度改为8 不然重复率太高
@@ -300,7 +297,7 @@ public class AppPermissionService {
             //创建钱包
             walletBiz.createWalletByUserId(appUserLogin.getId());
             // 登录结果要做做统一处理
-            JSONObject data = autoLogin(userid, username, headimgurl, nickname,code);
+            JSONObject data = autoLogin(userid, username, headimgurl, nickname,code,activityCode,1);
             // 到im注册，获取返回结果
             Map<String, Object> map = registerIm(username, appUserLogin.getPassword(), nickname);
             if (map != null) {
@@ -320,7 +317,7 @@ public class AppPermissionService {
                 data.put("imUserId", imUserId);
             }
             if (data != null) {
-                sendQueue(username, password, headimgurl, nickname, mobilecode, openId, unionid, type, inviterCode, activityCode, userid,RegisterQueueDTO.SIGN_NEW);
+                sendQueue(username, password, headimgurl, nickname, mobilecode, openId, unionid, type, code, activityCode, userid,RegisterQueueDTO.SIGN_NEW);
                 return JsonResultUtil.createSuccessResultWithObj(data);
             } else {
                 return JsonResultUtil.createDefaultFail();
@@ -358,9 +355,9 @@ public class AppPermissionService {
     }
 
     /**
-     * 自动登录
+     * 自动登录type;1-app;2-小程序
      */
-    public JSONObject autoLogin(Integer userid, String username, String headimgurl, String nickname,String code) {
+    public JSONObject autoLogin(Integer userid, String username, String headimgurl, String nickname,String code,String activityCode,Integer type) {
         JSONObject data = new JSONObject();
         AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
         if (userVo != null) {
@@ -387,25 +384,16 @@ public class AppPermissionService {
             //更新登录时间 和 ip
             String clientIp = getIp();
             appUserLoginBiz.updateLoginInfo(userid, clientIp);
+            if(type!=null&&type==1){
                 try {
-                String code1=null;
-                String activityCode=null;
-                if (StringUtils.isNotBlank(code)){
-                    //判断处理活动关键字
-                    String[] codes = code.split("_");
-                    if(codes.length > 1) {
-                        code1 = codes[0];
-                        activityCode = codes[1];
-                    }
-                }
                     Integer parentId=0;
-                if (StringUtils.isNotBlank(code1)) {
-                     parentId = appUserDetailBiz.getUserByCode(code1);
+                    if (StringUtils.isNotBlank(code)) {
+                        parentId = appUserDetailBiz.getUserByCode(code);
+                    }
                     //绑定上下线关系
                     if (parentId != null && parentId > 0) {
                         relationBiz.bindRelation(userid, parentId, 1);
                     }
-                }
                     //活动消息
                     Integer state=userVo.getState();
                     if(state!=null&&state==1){
@@ -414,12 +402,13 @@ public class AppPermissionService {
                         }
                         userVo.setState(2);
                         appUserDetailBiz.updUuserInfoById(userVo);
-                        sendQueue(username,null, headimgurl, nickname, null, null, null, null, code1, activityCode, userid,RegisterQueueDTO.SIGN_ACTIVATE);
+                        sendQueue(username,null, headimgurl, nickname, null, null, null, null, code, activityCode, userid,RegisterQueueDTO.SIGN_ACTIVATE);
                     }
                 }catch (Exception e){
                     e.printStackTrace();
                 }
             }
+        }
 
 
         return data;
@@ -512,8 +501,17 @@ public class AppPermissionService {
                         userDetail.setNickname(nickname);
                         appUserDetailBiz.updateSelectiveById(userDetail);
                     }*/
+                    String activityCode=null;
+                    if (StringUtils.isNotBlank(code)){
+                        //判断处理活动关键字
+                        String[] codes = code.split("_");
+                        if(codes.length > 1) {
+                            code = codes[0];
+                            activityCode = codes[1];
+                        }
+                    }
                     // 登录结果要做做统一处理
-                    JSONObject data = autoLogin(userid, username, headimgurl, nickname,code);
+                    JSONObject data = autoLogin(userid, username, headimgurl, nickname,code,activityCode,1);
                     // 到im登录，获取返回结果
                     /*Integer  imUserId=userLogin.getImUserid();
                     String imPassword=userLogin.getImPassword();
@@ -600,7 +598,16 @@ public class AppPermissionService {
             headimgurl = userVo.getHeadimgurl();
             nickname = userVo.getNickname();
         }
-        JSONObject data = autoLogin(userid, userLogin.getUsername(), headimgurl, nickname,code);
+        String activityCode=null;
+        if (StringUtils.isNotBlank(code)){
+            //判断处理活动关键字
+            String[] codes = code.split("_");
+            if(codes.length > 1) {
+                code = codes[0];
+                activityCode = codes[1];
+            }
+        }
+        JSONObject data = autoLogin(userid, userLogin.getUsername(), headimgurl, nickname,code,activityCode,1);
        /* // 到im注册，获取返回结果
         Integer  imUserId=userLogin.getImUserid();
         String imPassword=userLogin.getImPassword();
@@ -642,7 +649,16 @@ public class AppPermissionService {
             }
             Integer userid = user.getId();
             String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
-            JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname,code);
+            String activityCode=null;
+            if (StringUtils.isNotBlank(code)){
+                //判断处理活动关键字
+                String[] codes = code.split("_");
+                if(codes.length > 1) {
+                    code = codes[0];
+                    activityCode = codes[1];
+                }
+            }
+            JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname,code,activityCode,1);
             /*// 到im注册，获取返回结果
             Integer  imUserId=user.getImUserid();
             String imPassword=user.getImPassword();
@@ -683,7 +699,7 @@ public class AppPermissionService {
             appUserLoginBiz.updatePasswordById(user);
             Integer userid = user.getId();
             String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
-            JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname,null);
+            JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname,null,null,null);
            /* // 到im登录，获取返回结果
             Integer  imUserId=user.getImUserid();
             String imPassword=user.getImPassword();
@@ -837,7 +853,7 @@ public class AppPermissionService {
      * @return
      */
     public JSONObject appletLoginByUserId(Integer uid) {
-        JSONObject data = autoLogin(uid, null, null, null,null);
+        JSONObject data = autoLogin(uid, null, null, null,null,null,2);
         if (data.getDate("userId") != null) {
             return JsonResultUtil.createSuccessResultWithObj(data);
         }
@@ -905,7 +921,7 @@ public class AppPermissionService {
            /* //参加新人活动
             jionActivity(userid);*/
             // 登录结果要做做统一处理
-            JSONObject data = autoLogin(userid, username, headimgurl, nickname,null);
+            JSONObject data = autoLogin(userid, username, headimgurl, nickname,null,null,2);
             // 到im注册，获取返回结果
             Map<String, Object> map = registerIm(username, appUserLogin.getPassword(), nickname);
             if (map != null) {