edit

app/Http/Controllers/Api/MobileWeb/OrderListController.php

@@ -49,7 +49,7 @@ class OrderListController extends Controller
             if ($error_message) {
                 return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
             }
-            $return_data = OrderListService::receiving($request->all());
+            $return_data = OrderListService::receiving($request->all(),$request->ip());
         }
         return response()->json($return_data);
     }
@@ -63,10 +63,21 @@ class OrderListController extends Controller
             return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
         }
 
-        $return_data = OrderListService::refuse($request->all());
+        $return_data = OrderListService::refuse($request->all(),$request->ip());
         return response()->json($return_data);
     }
 
+    //预约安装
+    public function contact ( Request $request ){
+        // 验证数据
+        $error_message = $this->dataValidator->contactValidator($request->all());
+        if ($error_message) {
+            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
+        }
+
+        $return_data = OrderListService::contact($request->all(),$request->ip());
+        return response()->json($return_data);
+    }
     // 检验
     public function inspect(Request $request)
     {

app/Http/Middleware/WebLogin.php

@@ -37,7 +37,7 @@ class WebLogin
         // 拿到token获取登录表信息
         $login_web = DB::table('login_web')
                         ->where('api_token','=',$api_token)
-                        ->select('lowe_last_login','api_token','company_id','install_id','admin_id','user_type')
+                        ->select('lowe_last_login','api_token','company_id','install_id','admin_id','user_type','install_name')
                         ->first();
         if(empty($login_web)){
             return response()->json(["ErrorCode"=>300,'ErrorMessage'=>'api_token失效：检索码03，请重新登录！','data'=>'']);

app/Http/Requests/Validators/Api/MobileWeb/OrderListValidator.php

@@ -111,19 +111,21 @@ class OrderListValidator extends FormRequest
     {
         // 自定义错误消息
         $messages = [
-            'install_id.required' => '参数错误',
-            'admin_id.required' => '参数错误',
             'id.required' => '请输入服务工单id',
             'id.integer' => '参数错误',
+            'stauas.required' => '订单状态错误',
+            'stauas.integer' => '参数错误',
+            'refuseType.required' => '未选择拒单方式',
+            'refuseType.integer' => '参数错误',
             'remarks.required' => '请输入拒单备注',
             'remarks.max' => '拒单备注长度超出限制',
         ];
 
         // 数据验证
         $validator = Validator::make($data, [
-            'install_id' => 'required|integer|min:1',
-            'admin_id' => 'required|integer|min:1',
             'id' => 'required|integer|min:1',
+            'stauas' => 'required|integer|min:1',
+            'refuseType' => 'required|integer|min:1',
             'remarks' => 'required|string|max:255',
         ], $messages);
 
@@ -132,6 +134,27 @@ class OrderListValidator extends FormRequest
             return $validator->errors();
         }
     }
+    // 预约验证器
+    public function contactValidator($data)
+    {
+        // 自定义错误消息
+        $messages = [
+            'id.required' => '请输入服务工单id',
+            'id.integer' => '参数错误',
+            'day_time.required' => '请填写预约时间',
+        ];
+
+        // 数据验证
+        $validator = Validator::make($data, [
+            'id' => 'required|integer|min:1',
+            'day_time' => 'required|string|max:255',
+        ], $messages);
+
+        // 判断数据验证是否成功
+        if ($validator->fails()) {
+            return $validator->errors();
+        }
+    }
 
     // 开始安装验证器
     public function startInstallValidator($data)

app/Models/OrderRejected.php

+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+class OrderRejected extends Model
+{
+    //指定表名
+    protected $table = 'order_rejected';//退单表 模型
+    protected $guarded = [];
+    public $timestamps = false;
+
+
+}

app/Services/CommonService.php

@@ -1543,4 +1543,21 @@ class CommonService extends Service{
         }
     }
     /*----------------------------------------------------同步库存erp系统-----------------------------------------------*/
+    //移动端操作日志 /*$type:操作类型  $order_number:操作单号   $content:操作内容   $model:操作模块*/
+    public static function inserting_log($type,$order_number,$content,$model,$session,$ip){
+        $model_name=$model;
+        $data['czrz_name'] = $session['install_name'];//登录者
+        $data['czrz_ip'] = $ip;//操作ip
+        $data['czrz_czsj'] = date("Y-m-d H:i:s");//创建时间
+        $data['test_data'] = $model_name;//操作模块名称
+        $data['czrz_czlx'] = $type;//创建类型
+        $data['czrz_czxq'] = $content;//操作内容
+        $data['czrz_number']= $order_number;//操作单号
+        $res = Czrz::insert($data); //添加操作日志
+        if($res){
+            return 1;
+        }else{
+            return 2;
+        }
+    }
 }

routes/api.php

@@ -1419,9 +1419,12 @@ Route::namespace('Api')->group(function () {
         Route::post('w1/OrderList/index', 'MobileWeb\OrderListController@index'); //服务工单列表
         Route::post('w1/OrderList/receiving', 'MobileWeb\OrderListController@receiving'); //接单
         Route::post('w1/OrderList/refuse', 'MobileWeb\OrderListController@refuse'); //拒单
+        Route::post('w1/OrderList/contact', 'MobileWeb\OrderListController@contact'); //预约
+        Route::post('w1/OrderList/lineStart', 'MobileWeb\OrderListController@lineStart'); //出发
+        Route::post('w1/OrderList/lineArrive', 'MobileWeb\OrderListController@lineArrive'); //抵达
         Route::post('w1/OrderList/startInstall', 'MobileWeb\OrderListController@startInstall'); //开始安装
-        Route::post('w1/OrderList/inspect', 'MobileWeb\OrderListController@inspect'); //检验
         Route::post('w1/OrderList/installFeedback', 'MobileWeb\OrderListController@installFeedback'); //安装反馈
+        Route::post('w1/OrderList/inspect', 'MobileWeb\OrderListController@inspect'); //检验
         Route::post('w1/OrderList/info', 'MobileWeb\OrderListController@info'); //详情
         Route::post('w1/OrderList/getInstallPerson', 'MobileWeb\OrderListController@getInstallPerson'); //获取技师
         Route::post('w1/OrderList/getLabel', 'MobileWeb\OrderListController@getLabel'); //获取标签