Merge branch 'master' into develop

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -43,7 +43,7 @@ class ServiceController extends AdminController
                 $batch->disableDelete();
             });
         });
-        $grid->model()->orderBy('id','desc');
+        $grid->model()->where('status','!=',3)->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('ondocter.avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('ondocter.id', __('医生ID'));
@@ -51,9 +51,9 @@ class ServiceController extends AdminController
         $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
         $grid->column('docterorganization', __('所属机构'))->pluck('organization_id')->display(function ($organization){
-            $value = Organization::whereIn('id',$organization->toArray())->pluck('name')->toArray();
+            $value = Organization::whereIn('id',$organization->toArray())->pluck('intro')->toArray();
             return $value;
-        })->label('info');
+        })->label('info')->width(300);
         $grid->column('ondocter.label', __('标签'))->display(function ($label){
             if($label==null || $label == '无')
             {
@@ -77,7 +77,7 @@ class ServiceController extends AdminController
             $filter->disableIdFilter();
             $filter->equal('service_type','服务类别')->select([1 => '图文', 2 => '电话', 3 => '问诊']);
             $filter->equal('status','状态')->select([1=>'待审核',2 =>'已通过 ',3=>'未开通']);
-            $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('name','id'));
+            $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('intro','id'));
         });
         $grid->actions(function ($actions) {
             $actions->disableEdit();

app/Admin/Controllers/UserManagement/DocterManagement/DoctorManagementController.php

@@ -43,7 +43,7 @@ class DoctorManagementController extends AdminController
             $filter->equal('phone','电话');
             $filter->where(function ($query) {
                 $query->whereHas('organization',function ($query){
-                    $query->where('name','like',"%{$this->input}%");
+                    $query->where('intro','like',"%{$this->input}%");
                 });
             },'机构名');
             $filter->equal('status','工作状态')->select([

app/Http/Controllers/Api/V1/CommonController.php

@@ -62,22 +62,36 @@ class CommonController extends Controller
             if(isset($decryptedData['unionId']))$data['unionid'] = $decryptedData['unionId'];
         }
         if (empty($user)){
-            $add = [
-                'openid' => $data['openid'],
-                'unionid' => $data['unionid'] ?? '',
-                'latitude' => $req['latitude'] ?? 0,
-                'longitude' => $req['longitude'] ?? 0,
-                'phone' => $req['phone'] ?? '',
-                'session_key' => $session_key,
-                'last_login_time' => time(),
-            ];
+            if (!empty($req['phone']) && User::where('phone', $req['phone'])->exists()) {
+                User::where('phone', $req['phone'])->update([
+                    'openid' => $data['openid'],
+                    'unionid' => $data['unionid'] ?? '',
+                    'latitude' => $req['latitude'] ?? 0,
+                    'longitude' => $req['longitude'] ?? 0,
+                    'session_key' => $session_key,
+                    'last_login_time' => time(),
+                    'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
+                ]);
+                $user = User::where('phone', $req['phone'])->first();
+            }
+            else {
+                $add = [
+                    'openid' => $data['openid'],
+                    'unionid' => $data['unionid'] ?? '',
+                    'latitude' => $req['latitude'] ?? 0,
+                    'longitude' => $req['longitude'] ?? 0,
+                    'phone' => $req['phone'] ?? '',
+                    'session_key' => $session_key,
+                    'last_login_time' => time(),
+                ];
 
-            $add['nickname'] = $req['nickname'] ?? '';
-            $add['avatar'] = $req['avatar'] ?? request()->getScheme().'://'.request()->getHost().'/img/default-head.png';
-            $user = User::create($add);
-            if (empty($add['nickname'])) {
-                $nickname = '用户'.base_convert($user['id'], 10, 16);
-                User::where('id', $user['id'])->update(['nickname' => $nickname]);
+                $add['nickname'] = $req['nickname'] ?? '';
+                $add['avatar'] = $req['avatar'] ?? request()->getScheme().'://'.request()->getHost().'/img/default-head.png';
+                $user = User::create($add);
+                if (empty($add['nickname'])) {
+                    $nickname = '用户'.base_convert($user['id'], 10, 16);
+                    User::where('id', $user['id'])->update(['nickname' => $nickname]);
+                }
             }
         }
         else {
@@ -138,16 +152,27 @@ class CommonController extends Controller
             \Log::info($decryptedData);
             if(isset($decryptedData['unionId']))$data['unionid'] = $decryptedData['unionId'];
             if (!User::where('openid', $data['openid'])->exists()){
-                $user = User::create([
-                    'openid' => $data['openid'],
-                    'unionid' => $data['unionid']?? '',
-                    'phone' => $decryptedData['phoneNumber'],
-                    'session_key' => $data['session_key'],
-                    'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
-                    'last_login_time' => time(),
-                ]);
-                $nickname = '用户'.base_convert($user['id'], 10, 16);
-                User::where('id', $user['id'])->update(['nickname' => $nickname]);
+                if (User::where('phone', $decryptedData['phoneNumber'])->exists()) {
+                    User::where('phone', $decryptedData['phoneNumber'])->update([
+                        'openid' => $data['openid'],
+                        'unionid' => $data['unionid'] ?? '',
+                        'session_key' => $data['session_key'],
+                        'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
+                        'last_login_time' => time(),
+                    ]);
+                }
+                else {
+                    $user = User::create([
+                        'openid' => $data['openid'],
+                        'unionid' => $data['unionid']?? '',
+                        'phone' => $decryptedData['phoneNumber'],
+                        'session_key' => $data['session_key'],
+                        'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
+                        'last_login_time' => time(),
+                    ]);
+                    $nickname = '用户'.base_convert($user['id'], 10, 16);
+                    User::where('id', $user['id'])->update(['nickname' => $nickname]);
+                }
             }
 
         } catch (\Exception $e) {

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -39,7 +39,8 @@ class OrganizationController extends AuthController
             $builder->where('city_id', $req['city_id']);
         }
         if (!empty($req['city_name'])) {
-            $city_id = Area::where('name', 'like', '%'.$req['city_name'].'%')->where('level', 2)->value('id');
+            $city_name = str_replace('市', '', $req['city_name']);
+            $city_id = Area::where('name', 'like', $city_name.'%')->where('level', 2)->value('id');
             $city_id = !empty($city_id) ? $city_id : '';
             $builder->where('city_id', $city_id);
         }