wupengfei 2 years ago
parent
commit
3953593142
2 changed files with 28 additions and 26 deletions
  1. 1 1
      .idea/workspace.xml
  2. 27 25
      application/user/controller/Member.php

+ 1 - 1
.idea/workspace.xml

@@ -208,7 +208,7 @@
       <workItem from="1671065604459" duration="7662000" />
       <workItem from="1671152221434" duration="19086000" />
       <workItem from="1672793409629" duration="408000" />
-      <workItem from="1672793834653" duration="20254000" />
+      <workItem from="1672793834653" duration="20345000" />
     </task>
     <servers />
   </component>

+ 27 - 25
application/user/controller/Member.php

@@ -389,38 +389,40 @@ class Member extends Controller
                 $success_num++;
                 User::where('id',$ck_res)->update(['level_id'=>intval($new_user['3']),'level_exp'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4'])),'label'=>'|'.$new_user['5'].'|']);
                 continue;
-            }
-            $user_add= [];
-            $user_add['account_type'] =  $new_user['2'];
-            if($new_user['5']) $user_add['label'] =  '|'.$new_user['5'].'|';
-            if( $user_add['account_type']  == 1) {// 公司账号
-                $group_title  = explode('@', $new_user['1'])[1];
-                $group_info = UserGroup::where(['title'=>'@'.$group_title])->find();
-                if(empty($group_info)) continue;
-                $user_add['name'] = $new_user['0'] ? $new_user['0'] : 'G企业用户_'.$group_info->name.'_'.$group_title;
-                $check_group = User::where(['group_id'=>$group_info->id,'is_first'=>1])->value('id');//该公司是否有第一个注册的
-                $user_add['group_id']  = $group_info->id;
-                if(!$check_group) $user_add['is_first']  =1;
-                if($check_group) $user_add['group_first']  = $check_group;
-                $add_res  = User::create($user_add);
-                if(isset_full_check($user_add,'is_first',1)){
-                    User::where('id',$add_res->id)->update(['group_first'=>$add_res->id]);
+            }else{
+                $user_add= [];
+                $user_add['account_type'] =  $new_user['2'];
+                if($new_user['5']) $user_add['label'] =  '|'.$new_user['5'].'|';
+                if( $user_add['account_type']  == 1) {// 公司账号
+                    $group_title  = explode('@', $new_user['1'])[1];
+                    $group_info = UserGroup::where(['title'=>'@'.$group_title])->find();
+                    if(empty($group_info)) continue;
+                    $user_add['name'] = $new_user['0'] ? $new_user['0'] : 'G企业用户_'.$group_info->name.'_'.$group_title;
+                    $check_group = User::where(['group_id'=>$group_info->id,'is_first'=>1])->value('id');//该公司是否有第一个注册的
+                    $user_add['group_id']  = $group_info->id;
+                    if(!$check_group) $user_add['is_first']  =1;
+                    if($check_group) $user_add['group_first']  = $check_group;
+                    $add_res  = User::create($user_add);
+                    if(isset_full_check($user_add,'is_first',1)){
+                        User::where('id',$add_res->id)->update(['group_first'=>$add_res->id]);
+                        if($new_user['3'] > 0 && intval($new_user[4]) > 0) {
+                            UserLevelRank::create(['user_id'=>$add_res->id,'level_id'=>$new_user['3'],'start_time'=>time(),'end_time'=>time()+86400* intval($new_user['4']),'end_date'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4']))]);
+                            User::where('id',$add_res->id)->update(['level_id'=>intval($new_user['3']),'level_exp'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4']))]);
+                            $success_num++;
+                        }
+                    }
+                }else{
+                    $user_add['phone'] = trim($new_user['1']);
+                    $user_add['name'] = $new_user['0'] ? $new_user['0'] : 'G'. substr_replace( $new_user['1'],'****',3,4);
+                    $add_res  = User::create($user_add);
                     if($new_user['3'] > 0 && intval($new_user[4]) > 0) {
                         UserLevelRank::create(['user_id'=>$add_res->id,'level_id'=>$new_user['3'],'start_time'=>time(),'end_time'=>time()+86400* intval($new_user['4']),'end_date'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4']))]);
                         User::where('id',$add_res->id)->update(['level_id'=>intval($new_user['3']),'level_exp'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4']))]);
                         $success_num++;
                     }
                 }
-            }else{
-                $user_add['phone'] = trim($new_user['1']);
-                $user_add['name'] = $new_user['0'] ? $new_user['0'] : 'G'. substr_replace( $new_user['1'],'****',3,4);
-                $add_res  = User::create($user_add);
-                if($new_user['3'] > 0 && intval($new_user[4]) > 0) {
-                    UserLevelRank::create(['user_id'=>$add_res->id,'level_id'=>$new_user['3'],'start_time'=>time(),'end_time'=>time()+86400* intval($new_user['4']),'end_date'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4']))]);
-                    User::where('id',$add_res->id)->update(['level_id'=>intval($new_user['3']),'level_exp'=>date('Y-m-d H:i:s',time()+86400*intval($new_user['4']))]);
-                    $success_num++;
-                }
             }
+
         }
         $this->success('成功导入会员:'.$success_num);
     }