Merge branch 'master' of http://gitlab.bluearp.com/ldj/zptz-sass-kelaidian

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

@@ -108,17 +108,24 @@ class AftersaleOrderController extends Controller
      */
     public function upload(Request $request)
     {
-        $session = $request['session'];
-        // if (empty($request['file'])) {
-        //     return response()->json(['ErrorCode' => 2, 'ErrorMessage' => '请上传文件', 'Data' => []]);
-        // }
-        $request['path'] = './afterSale/'.date('Ym');
-        $return_data = DealPicService::upload($request);
-        if ($return_data['code'] == 200) {
-            return response()->json(['ErrorCode' => 1, 'ErrorMessage' => '上传成功', 'Data' => $return_data['data']]);
-        } else {
-            return response()->json(['ErrorCode' => 2, 'ErrorMessage' => $return_data['msg'], 'Data' => '']);
+        // 验证数据
+        $error_message = $this->dataValidator->uploadValidator($request->all());
+        if ($error_message) {
+            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
         }
+        $return_data = AftersaleOrderService::upload($request->all());
+        return response()->json($return_data);
+    }
+    //删除图片
+    public function deletPic ( Request $request ){
+        // 验证数据
+        $error_message = $this->dataValidator->deletPicValidator($request->all());
+        if ($error_message) {
+            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
+        }
+
+        $return_data = AftersaleOrderService::deletPic($request->all(),$request->ip());
+        return response()->json($return_data);
     }
 
     /**

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

@@ -85,6 +85,50 @@ class AftersaleOrderValidator extends FormRequest
             return $validator->errors();
         }
     }
+    // 日常反馈验证器
+    public function uploadValidator($data)
+    {
+        // 自定义错误消息
+        $messages = [
+            'id.required' => '请选择售后单id',
+            'id.integer' => '参数错误',
+            'file.required' => '请输入反馈内容',
+        ];
+
+        // 数据验证
+        $validator = Validator::make($data, [
+            'id' => 'required|integer|min:1',
+            'file' => 'required',
+        ], $messages);
+
+        // 判断数据验证是否成功
+        if ($validator->fails()) {
+            return $validator->errors();
+        }
+    }
+
+    // 添加图片验证器
+    public function deletPicValidator($data)
+    {
+        // 自定义错误消息
+        $messages = [
+            'id.required' => '请输入订单id',
+            'id.integer' => '参数错误',
+            'file_id.required' => '请输入图片类型',
+            'file_id.in' => '参数错误',
+        ];
+
+        // 数据验证
+        $validator = Validator::make($data, [
+            'id' => 'required|integer|min:1',
+            'file_id' => 'required|integer|min:1',
+        ], $messages);
+
+        // 判断数据验证是否成功
+        if ($validator->fails()) {
+            return $validator->errors();
+        }
+    }
 
     // 列表验证器
     public function infoValidator($data)

app/Services/Api/MobileWeb/LoginService.php

@@ -171,6 +171,7 @@ class LoginService
             ->update(['priority'=>2,'update_time'=>date('Y-m-d H:i:s')]);
         $find_data = DB::table('installation_master')
             ->where('check_code',$find_person['check_code'])
+            ->where('type',$request['user_type'])
             ->value('id');
         if($find_data){
             return DB::table('installation_master')

app/Services/Api/MobileWeb/OrderListService.php

@@ -1033,7 +1033,9 @@ class OrderListService extends Model
                 ->where('is_delect',1)
                 ->value('id');
             if($feedback){
-                $res = Feedback::where('type',$request['type'])->update(['is_delect'=>2]);
+                $res = Feedback::where('type',$request['type'])
+                    ->where('gl_id',$orderListArr['id'])
+                    ->update(['is_delect'=>2]);
                 if($res) {
                     $arr['type_name'] = self::getPicName($request['type']);//'1';
                     $typename = '删除'.$arr['type_name'].'图';

routes/api.php

@@ -1468,6 +1468,7 @@ Route::namespace('Api')->group(function () {
         Route::post('w1/after/info', 'MobileWeb\AftersaleOrderController@info'); //详情
         Route::post('w1/after/addAfterSalePic', 'MobileWeb\AftersaleOrderController@addAfterSalePic'); //上传售后图片
         Route::post('w1/after/upload', 'MobileWeb\AftersaleOrderController@upload'); //上传售后图片
+        Route::post('w1/after/deletPic', 'MobileWeb\AftersaleOrderController@deletPic'); //删除图片
         Route::post('w1/after/quality', 'MobileWeb\AftersaleOrderController@quality'); //申请完成
 
         // 账单列表