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

README.md

@@ -34,6 +34,24 @@
 - transformer [fractal](http://fractal.thephpleague.com/)
 - apizza https://apizza.net/pro/#/project/3b5527149ee5681048874c0771678232/browse
 
+##composer 拓展安装
+- 编辑器
+- 后台图片工具
+
+##后台定时命令
+订单超时 每日11:00执行
+cd /www/wwwroot/BaoMa && php artisan order orderOut<br>
+预约超时 每日11:00 执行
+cd /www/wwwroot/BaoMa && php artisan order appiontOut<br>
+认证到期 每日11:00 执行
+cd /www/wwwroot/BaoMa && php artisan order thenOut<br>
+认证失效 每日11:00 执行
+cd /www/wwwroot/BaoMa && php artisan order thenLose<br>
+排班提醒 每日00:00 执行
+cd /www/wwwroot/BaoMa && php artisan  scheduleNotice<br>
+服务包过期 每10分钟执行
+cd /www/wwwroot/BaoMa && php artisan  packExpiredCheck<br>
+
 ## 数据清空语句
 delete from bm_cdms_users where id > 1;<br>
 delete from bm_cdms_role_users where user_id >1;<br>
@@ -96,6 +114,25 @@ delete from bm_organizations;<br>
 delete from bm_refund_application;<br>
 
 
+##清空用户数据
+delete  from bm_order_packs where order_id in (select id from bm_orders where user_id =10007 );<br>
+delete  from bm_order_patients where order_id in (select id from bm_orders where user_id =10007 );<br>
+delete  from bm_order_vaccines where order_id in (select id from bm_orders where user_id =10007 );<br>
+delete  from bm_order_nurses where order_id in (select id from bm_orders where user_id = 10007);<br>
+delete from bm_feedbacks  where user_id =10007;<br> 
+delete  from bm_users where id = 10007;<br>
+delete  from bm_orders where user_id = 10007;<br>
+
+
+##清空医生数据
+delete from bm_docter_settings where docter_id  = 1007;<br>
+delete  from bm_order_packs where order_id in (select docter_id from bm_orders where docter_id=10007 );<br>
+delete  from bm_order_patients where order_id in (select id from bm_orders where docter_id=10007 );<br>
+delete  from bm_order_vaccines where order_id in (select id from bm_orders where docter_id=10007 );<br>
+delete  from bm_order_nurses where order_id in (select id from bm_orders where docter_id= 10007);<br>
+delete from bm_docters where id = 10007;<br>
+delete from bm_docter_organization where docter_id  = 10007;<br>
+
 
 
 

app/Console/Commands/ImportOrder.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Imports\chatOrder;
+use Illuminate\Console\Command;
+use Maatwebsite\Excel\Facades\Excel;
+class ImportOrder extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'importOrder {type} {filepath}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '订单数据导入';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $type = $this->argument('type');
+        $file_path = $this->argument('filepath');
+
+        //路径相对于项目根目录即 /public
+        if(empty($type) || empty($file_path)){
+            dd('请输入完整参数');
+        }
+        //图文咨询订单导入
+        if($type == 'chat'){
+            $this->makeChat($file_path);
+        }
+    }
+
+    public function makeChat($file_path)
+    {
+        $this->imports($file_path);
+    }
+
+    public function imports($filePath)
+    {
+        $filePath = './public/import/' . $filePath . '.xls';
+
+        Excel::import(new chatOrder(), $filePath);
+
+//delete from bm_docter_settings where docter_id  = 10002;
+//delete  from bm_order_packs where order_id in (select docter_id from bm_orders where docter_id=10002 );
+//delete  from bm_order_patients where order_id in (select id from bm_orders where docter_id=10002 );
+//delete  from bm_order_vaccines where order_id in (select id from bm_orders where docter_id=10002 );
+//delete  from bm_order_nurses where order_id in (select id from bm_orders where docter_id= 10002);
+//delete from bm_docters where id = 10002;
+//delete from bm_docter_organization where docter_id  = 10002;
+    }
+}

app/Console/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace App\Console;
 
+use App\Console\Commands\ImportOrder;
 use App\Console\Commands\overTimeOrder;
 use App\Console\Commands\packExpiredCheck;
 use Illuminate\Console\Scheduling\Schedule;
@@ -19,6 +20,7 @@ class Kernel extends ConsoleKernel
         'order'=>overTimeOrder::class,
         'scheduleNotice'=>overTimeOrder::class,
         'packExpiredCheck'=>packExpiredCheck::class,
+        'importOrder'=>ImportOrder::class,
     ];
 
     /**

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

@@ -180,6 +180,8 @@ class CommonController extends Controller
             $user = Docter::create($docter_list);
             $nickname = '医生' . base_convert($user['id'], 10, 16);
             Docter::where('id', $user['id'])->update(['name' => $nickname]);
+        }else{
+            Docter::where('id', $find['id'])->update(['openid' => $data['openid'],'session_key'=>$session_key]);
         }
         return out($decryptedData);
     }
@@ -206,7 +208,7 @@ class CommonController extends Controller
         if (empty($find)){
             $docter_list = [
                 'type' => 1,
-                'name' => '用户名',
+                'name' => '医生' . base_convert($find['id'], 10, 16),
                 'phone' => $req['phone'],
                 'sex' => 0,
                 'birthday' => 0,

app/Http/Controllers/Api/V2/DoctorController.php

@@ -509,7 +509,7 @@ class DoctorController extends AuthController
                     ];
                     if($save_data['amStartTime']&&$save_data['amEndTime']){
                         $serviceData[0]['docter_id']=$doctor_id;
-                        $serviceData[0]['type']=2;
+                        $serviceData[0]['type']=1;
                         $serviceData[0]['start_time_period']=$save_data['amStartTime'];
                         $serviceData[0]['end_time_period']=$save_data['amEndTime'];
                         $serviceData[0]['start_time_line']=str_replace(':','',$save_data['amStartTime']);
@@ -519,7 +519,7 @@ class DoctorController extends AuthController
                     }
                     if($save_data['pmStartTime']&&$save_data['pmEndTime']){
                         $serviceData[1]['docter_id']=$doctor_id;
-                        $serviceData[1]['type']=2;
+                        $serviceData[1]['type']=1;
                         $serviceData[1]['start_time_period']=$save_data['pmStartTime'];
                         $serviceData[1]['end_time_period']=$save_data['pmEndTime'];
                         $serviceData[1]['start_time_line']=str_replace(':','',$save_data['pmStartTime']);
@@ -530,7 +530,7 @@ class DoctorController extends AuthController
                     }
                     if($save_data['nightStartTime']&&$save_data['nightEndTime']){
                         $serviceData[2]['docter_id']=$doctor_id;
-                        $serviceData[2]['type']=2;
+                        $serviceData[2]['type']=1;
                         $serviceData[2]['start_time_period']=$save_data['nightStartTime'];
                         $serviceData[2]['end_time_period']=$save_data['nightEndTime'];
                         $serviceData[2]['start_time_line']=str_replace(':','',$save_data['nightStartTime']);
@@ -861,15 +861,6 @@ class DoctorController extends AuthController
         if (!$doctor_id) {
             return out(null, 500, '医生信息错误！');
         }
-        if (count(explode(',',$req['certificate']))!=2){
-            return out(null, 500, '医生照片和执业证书数量错误！');
-        }
-        if(count(explode(',',$req['idPhoto']))!=2){
-            return out(null, 500, '身份证正反面数量错误！');
-        }
-        if(count(explode(',',$req['doctorQualification']))!=2){
-            return out(null, 500, '照片和资格证书数量错误！');
-        }
         $data = [];
         $data['name'] = $req['name'];
         $data['sex'] = $req['sex'];

app/Imports/chatOrder.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Imports;
+
+use App\Order;
+use Maatwebsite\Excel\Concerns\ToModel;
+
+class chatOrder implements ToModel
+{
+    /**
+    * @param array $row
+    *
+    * @return \Illuminate\Database\Eloquent\Model|null
+    */
+    public function model(array $row)
+    {
+        //处理逻辑
+        dd($row);
+        return new Order([
+            //
+        ]);
+    }
+}