BugFixed

app/Admin/Controllers/PhoneServiceController.php

@@ -4,7 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Models\Docter;
 use App\Models\Order;
-use App\Models\Doctertimes;
+use App\Models\DocterTimes;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -32,7 +32,7 @@ class PhoneServiceController extends AdminController
         $grid->column('name','医生姓名');
         $grid->column('phone_price','咨询价格');
         $grid->column('step_price','步进价格')->display(function (){
-            $step = Doctertimes::where(['docter_id'=>$this->id])->value('step_price');
+            $step = DocterTimes::where(['docter_id'=>$this->id])->value('step_price');
             return $step;
         });
 

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -10,7 +10,7 @@ use App\Admin\Actions\Service\RevokeAction;
 use App\Models\Docter;
 use App\Models\DocterLabel;
 use App\Models\Order;
-use App\Models\Doctertimes;
+use App\Models\DocterTimes;
 use App\Models\Organization;
 use App\Models\Serviceapplys;
 use Encore\Admin\Controllers\AdminController;

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

@@ -3,7 +3,7 @@
 namespace App\Admin\Controllers\UserManagement\DocterManagement;
 
 use App\Models\Docter;
-use App\Models\Doctertimes;
+use App\Models\DocterTimes;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -25,7 +25,7 @@ class ChatController extends AdminController
      */
     protected function grid()
     {
-        $grid = new Grid(new Doctertimes());
+        $grid = new Grid(new DocterTimes());
         $grid->disableCreateButton();
         $grid->disableActions();
         $grid->disableBatchActions();
@@ -38,7 +38,7 @@ class ChatController extends AdminController
         $grid->column('type', __('类型'))->using([1=>'电话咨询',2=>'图文咨询',3=>'门诊咨询',4=>'疫苗预约接种',5=>'儿保预约',6=>'服务包',7=>'充值']);
         $grid->column('base_price', __('基础价格'));
         $grid->column('am', __('上午服务时间'))->display(function (){
-            $service_time = Doctertimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
+            $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);
             $obj_arr = object_array($arr);
             if (empty($obj_arr[1]))
@@ -51,7 +51,7 @@ class ChatController extends AdminController
             }
         });
         $grid->column('pm', __('下午服务时间'))->display(function (){
-            $service_time = Doctertimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
+            $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);
             $obj_arr = object_array($arr);
             if (empty($obj_arr[2]))
@@ -64,7 +64,7 @@ class ChatController extends AdminController
             }
         });
         $grid->column('night', __('晚上服务时间'))->display(function (){
-            $service_time = Doctertimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
+            $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);
             $obj_arr = object_array($arr);
             if (empty($obj_arr[3]))
@@ -90,7 +90,7 @@ class ChatController extends AdminController
      */
     protected function detail($id)
     {
-        $show = new Show(Doctertimes::findOrFail($id));
+        $show = new Show(DocterTimes::findOrFail($id));
 
         $show->field('id', __('Id'));
         $show->field('docter_id', __('Docter id'));
@@ -113,7 +113,7 @@ class ChatController extends AdminController
      */
     protected function form()
     {
-        $form = new Form(new Doctertimes());
+        $form = new Form(new DocterTimes());
 
         $form->number('docter_id', __('Docter id'));
         $form->decimal('base_price', __('Base price'));

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

@@ -2,7 +2,7 @@
 
 namespace App\Admin\Controllers\UserManagement\DocterManagement;
 
-use App\Models\Doctertimes;
+use App\Models\DocterTimes;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -24,7 +24,7 @@ class PhoneController extends AdminController
      */
     protected function grid()
     {
-        $grid = new Grid(new Doctertimes());
+        $grid = new Grid(new DocterTimes());
         $grid->disableCreateButton();
         $grid->disableActions();
         $grid->disableBatchActions();
@@ -39,7 +39,7 @@ class PhoneController extends AdminController
         $grid->column('base_price', __('基础价格'));
         $grid->column('base_price', __('步进价格'));
         $grid->column('am', __('上午服务时间'))->display(function (){
-            $service_time = Doctertimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
+            $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);
             $obj_arr = object_array($arr);
             if (empty($obj_arr[1]))
@@ -52,7 +52,7 @@ class PhoneController extends AdminController
             }
         });
         $grid->column('pm', __('下午服务时间'))->display(function (){
-            $service_time = Doctertimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
+            $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);
             $obj_arr = object_array($arr);
             if (empty($obj_arr[2]))
@@ -65,7 +65,7 @@ class PhoneController extends AdminController
             }
         });
         $grid->column('night', __('晚上服务时间'))->display(function (){
-            $service_time = Doctertimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
+            $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);
             $obj_arr = object_array($arr);
             if (empty($obj_arr[3]))
@@ -91,7 +91,7 @@ class PhoneController extends AdminController
      */
     protected function detail($id)
     {
-        $show = new Show(Doctertimes::findOrFail($id));
+        $show = new Show(DocterTimes::findOrFail($id));
 
         $show->field('id', __('Id'));
         $show->field('docter_id', __('Docter id'));
@@ -114,7 +114,7 @@ class PhoneController extends AdminController
      */
     protected function form()
     {
-        $form = new Form(new Doctertimes());
+        $form = new Form(new DocterTimes());
 
         $form->number('docter_id', __('Docter id'));
         $form->decimal('base_price', __('Base price'));

app/Community/Controllers/ServiceController.php

@@ -6,7 +6,7 @@ use App\Admin\Actions\Service\ApplysAction;
 use App\Admin\Actions\Service\RefuseAction;
 use App\Models\Docter;
 use App\Models\Order;
-use App\Models\Doctertimes;
+use App\Models\DocterTimes;
 use App\Models\Serviceapplys;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
@@ -43,7 +43,7 @@ class ServiceController extends AdminController
         $grid->column('ondocter.name','医生姓名');
         $grid->column('ondocter.phone_price','咨询价格');
         $grid->column('step_price','步进价格')->display(function (){
-            $step = Doctertimes::where(['docter_id'=>$this->id])->value('step_price');
+            $step = DocterTimes::where(['docter_id'=>$this->id])->value('step_price');
             return $step;
         });
 

app/Models/Docter.php

@@ -45,8 +45,8 @@ class Docter extends BaseModel
         return $this->hasMany(Order::class,'docter_id','id');
     }
 
-    public function doctertimes(){
-        return $this->belongsTo(Doctertimes::class);
+    public function DocterTimes(){
+        return $this->belongsTo(DocterTimes::class);
     }
     public function getIsCollectAttribute()
     {
@@ -86,13 +86,13 @@ class Docter extends BaseModel
 
     public function getChatPriceAttribute()
     {
-        $base_price = Doctertimes::where('docter_id', $this->id)->where('type', 2)->value('base_price');
+        $base_price = DocterTimes::where('docter_id', $this->id)->where('type', 2)->value('base_price');
         return $base_price*100;
     }
 
     public function getPhonePriceAttribute()
     {
-        $base_price = Doctertimes::where('docter_id', $this->id)->where('type', 1)->value('base_price');
+        $base_price = DocterTimes::where('docter_id', $this->id)->where('type', 1)->value('base_price');
         return $base_price*100;
     }
 }

app/Models/DocterTime.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: zilongs
- * Date: 20-9-29
- * Time: 上午11:12
- */
-
-namespace App\Models;
-
-class DocterTime extends BaseModel
-{
-  	public function docter()
-    {
-        return $this->hasOne(Docter::class, 'id', 'docter_id');
-    }
-}