Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

app/Community/Controllers/ApiController.php

@@ -345,12 +345,15 @@ class ApiController extends Controller
             $serviceNum = $docter_setting->service_num;
             $time_period = object_array(json_decode($docter_setting->service_time));
             $allCount = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->count();
+            dump($allCount);
             if($allCount == 0) return apiReturn(603,'请设置时间段');
+            echo '查看时间段';
             $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[1]['amStartTime']),intval($time_period[1]['amEndTime'])])->pluck('id')->toArray();
             $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[2]['pmStartTime']),intval($time_period[2]['pmEndTime'])])->pluck('id')->toArray();
             $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[3]['nightStartTime']),intval($time_period[3]['nightEndTime'])])->pluck('id')->toArray();
         }
         if(count($times) < 3){
+            echo '时间段少于三个时间段';
             return apiReturn('603','请配置时间段');
         }
 
@@ -806,6 +809,7 @@ class ApiController extends Controller
         ];
         $setting = [
             'docter_id'=>$docter_id,
+            'org_id'=>$org_id,
             'type'=>$sType,
             'status'=>$configData['status'],
             'show_days'=>$configData['showDayNumber'],
@@ -818,9 +822,11 @@ class ApiController extends Controller
         //更新配置
         $sId = DocterSetting::where(['docter_id'=>$docter_id,'org_id'=>$org_id,'type'=>$sType])->value('id');
         if($sId){
+            dump($sId);
             DocterSetting::where(['id'=>$sId])->update($setting);
         } else {
-            $setting['org_id'] = $org_id;
+            echo '插入数据';
+            dump($setting);
             DocterSetting::insert($setting);
         }
         return  apiReturn(200,'ok');
@@ -890,10 +896,10 @@ class ApiController extends Controller
      */
     public static function deleteScheduleInfo($docter_id,$timeType,$orgId=0){
         if($docter_id != 0){
-            TimePeriod::where(['docter_id'=>$docter_id,'type'=>$timeType])->where('org_id','=',$orgId)->delete();
+            TimePeriod::where(['docter_id'=>$docter_id,'type'=>$timeType,'org_id'=>$orgId])->delete();
             SchedulePeriod::where(['docter_id'=>$docter_id,'type'=>$timeType])->where('organization_id','=',$orgId)->delete();
         } else {
-            TimePeriod::where(['org_id'=>$orgId,'type'=>$timeType])->where('docter_id',0)->delete();
+            TimePeriod::where(['org_id'=>$orgId,'type'=>$timeType,'docter_id'=>$docter_id])->delete();
             SchedulePeriod::where(['organization_id'=>$orgId,'type'=>$timeType])->where('docter_id',0)->delete();
         }
         return true;
@@ -911,7 +917,7 @@ class ApiController extends Controller
                 'end_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + $i*$serviceTime*60),
             ];
             $isHave = TimePeriod::where($timePreiod)->count();
-            if(!$isHave) TimePeriod::insert($timePreiod);
+            if($isHave == 0) TimePeriod::insert($timePreiod);
         }
         return true;
     }

config/admin.php

@@ -95,7 +95,7 @@ return [
     | If your page is going to be accessed via https, set it to `true`.
     |
     */
-    'https' => env('ADMIN_HTTPS', false),
+    'https' => env('ADMIN_HTTPS', true),
 
     /*
     |--------------------------------------------------------------------------