Wesmiler 人人车 初始化项目 0816

application/admin/controller/store/Taxi.php

@@ -190,6 +190,7 @@ class Taxi extends AdminController
         $user = model('common/TaxiUser');
 
         return IResponse::paginate($user->where($where)->with('user')
+            ->order('created_at','desc')
             ->paginate(input('limit'),false)->each(function($item, $k){
                 if(is_null($item['user'])){
                     $item['user'] = [];
@@ -208,16 +209,28 @@ class Taxi extends AdminController
             'id_card|身份证号' => 'require',
             'id_card_img|身份证件照片' => 'require',
             'mobile|手机号码' => 'require',
+            'password|登录密码' => 'require',
             'address|司机住址' => 'require',
             'dr_license|驾驶证照片' => 'require',
         ]);
 
+        if(model('common/TaxiUser')->where(['mobile'=> $params['mobile']])->find()){
+            IResponse::failure('手机号码已存在');
+        }
+
         // 错误返回
         (true !== $valid) && IResponse::failure($valid);
         // 保存数据
-        $userId = model('common/TaxiUser')->storeBy($params);
+        $taxiUserId = model('common/TaxiUser')->storeBy($params);
+        if($taxiUserId){
+            // 创建会员账号
+            $userId = model('common/users')->storeBy(['mobile'=> $params['mobile']]);
+            if($userId){
+                model('common/TaxiUser')->updateBy($taxiUserId, ['user_id'=> $userId]);
+            }
+        }
 
-        return $userId ? IResponse::success([],'新增司机成功'):
+        return $taxiUserId ? IResponse::success([],'新增司机成功'):
             IResponse::failure('新增司机异常');
     }
 

application/admin/controller/taxi/User.php

@@ -34,7 +34,10 @@ class User extends AdminController
         if (!$row) {
             IResponse::failure('记录不存在');
         }
-       
+
+        if(!$row['user_id'] || !model('common/users')->where(['id'=> $row['user_id']])->find()){
+            IResponse::failure('未绑定用户账号');
+        }
 
         $result = false;
         $this->model->startTrans();

route/route.php

@@ -42,7 +42,7 @@ Route::group('api',function (){
     // API V1
     Route::group(':ver',function () {
         // 管理登录 -- 独立跨域处理，验证码处理
-        Route::post('login','api/:ver.taxiUser/Auth/login')
+        Route::post('taxiuser/login','api/:ver.taxiUser/Auth/login')
             ->header('Access-Control-Allow-Origin', 'http://'.request()->rootDomain().'/api')
             ->header('Access-Control-Allow-Credentials', 'true')
             ->allowCrossDomain();