1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Member.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -106,7 +106,7 @@
     <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../lmt" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -152,6 +152,8 @@
       <workItem from="1659416262839" duration="13041000" />
       <workItem from="1659488112447" duration="6250000" />
       <workItem from="1659575317059" duration="6033000" />
+      <workItem from="1659582714779" duration="1715000" />
+      <workItem from="1659689454901" duration="439000" />
     </task>
     <servers />
   </component>

application/user/controller/Member.php

@@ -341,11 +341,21 @@ class Member extends Controller
         $success_num = 0;
         // name account account_type level_id days
         foreach ($res_arr  as $new_user) {
-            $check_where[] = $new_user['2'] == 1 ? ['email','=',$new_user['1']] : ['phone','=',$new_user['1']];
+            $check_where[] = $new_user['2'] == 1 ? ['email','=',trim($new_user['1'])]: ['phone','=',trim($new_user['1'])];
             $ck_res = User::where($check_where)->value('id');
-            if($ck_res) continue;
+            if($ck_res){
+                Data::save('UserLevelRank',[
+                    'user_id'=>$ck_res,
+                    'level_id'=>intval($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_id',['user_id'=>$ck_res]);
+                $success_num++;
+                User::where('id',$ck_res)->update(['level_id'=>intval($new_user['3']),'level_exp'=>time()+86400* intval($new_user['4'])]);
+                continue;
+            }
             $user_add= [];
-            $new_user['2'] == 1 ? $user_add['email'] = $new_user['1'] :  $user_add['phone'] = $new_user['1'];
+            $new_user['2'] == 1 ? $user_add['email'] = trim($new_user['1']) :  $user_add['phone'] = trim($new_user['1']);
             $user_add['name'] = $new_user['0'];
             $user_add['account_type'] =  $new_user['2'];
             $add_res  = User::create($user_add);