Skip to content

Z
zptz-sass-kelaidian
提交 ef2199b3 authored 作者: 李大见's avatar 李大见
浏览文件
操作

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

上级 4ad3bfa3 b3e035f3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 120 行增加 和 34 行删除
app/Http/Controllers/Api/MobileWeb/OrderListController.php
浏览文件 @ ef2199b3
......@@ -42,7 +42,7 @@ class OrderListController extends Controller
}
$input = $request->all();
if($input['type']==1){
$return_data = OrderListService::getPerson($request->all(),$request['old_install_id']);
$return_data = OrderListService::getPerson($request->all());
}
if($input['type']==2) {
$error_message = $this->dataValidator->receivingValidator($request->all());
......@@ -78,60 +78,99 @@ class OrderListController extends Controller
$return_data = OrderListService::contact($request->all(),$request->ip());
return response()->json($return_data);
}
// 检验
public function inspect(Request $request)
{
//改派
public function transferOfOrder ( Request $request ){
// 验证数据
$error_message = $this->dataValidator->startInstallValidator($request->all());
$error_message = $this->dataValidator->transferOfOrderStartValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$input = $request->all();
if($input['type']==1){
$return_data = OrderListService::getPerson($request->all(),$input['old_install_id']);
}
if($input['type']==2) {
$error_message = $this->dataValidator->transferOfOrderValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::transferOfOrder($request->all(),$request->ip());
}
return response()->json($return_data);
}
//出发
public function lineStart ( Request $request ){
$error_message = $this->dataValidator->lineValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::lineStart($request->all(),$request->ip());
return response()->json($return_data);
}
$return_data = OrderListService::inspect($request->all());
//抵达
public function lineArrive ( Request $request ){
$error_message = $this->dataValidator->lineValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::lineArrive($request->all(),$request->ip());
return response()->json($return_data);
}
// 开始安装
public function startInstall(Request $request)
//开始安装
public function startInstall ( Request $request ){
$error_message = $this->dataValidator->lineValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::startInstall($request->all(),$request->ip());
return response()->json($return_data);
}
// 详情
public function info(Request $request)
{
// 验证数据
$error_message = $this->dataValidator->startInstallValidator($request->all());
$error_message = $this->dataValidator->infoValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::startInstall($request->all());
$return_data = OrderListService::info($request->all());
return response()->json($return_data);
}
// 安装反馈
public function installFeedback(Request $request)
// 检验
public function inspect(Request $request)
{
// 验证数据
$error_message = $this->dataValidator->installFeedbackValidator($request->all());
$error_message = $this->dataValidator->startInstallValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::installFeedback($request->all());
$return_data = OrderListService::inspect($request->all());
return response()->json($return_data);
}
// 获取反馈信息
public function getFeedback(Request $request)
// 安装反馈
public function installFeedback(Request $request)
{
// 验证数据
$error_message = $this->dataValidator->startInstallValidator($request->all());
$error_message = $this->dataValidator->installFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::getFeedback($request->all());
$return_data = OrderListService::installFeedback($request->all(),$request->ip());
return response()->json($return_data);
}
// 详情
public function info(Request $request)
// 获取反馈信息
public function getFeedback(Request $request)
{
// 验证数据
$error_message = $this->dataValidator->startInstallValidator($request->all());
......@@ -139,7 +178,7 @@ class OrderListController extends Controller
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = OrderListService::info($request->all());
$return_data = OrderListService::getFeedback($request->all());
return response()->json($return_data);
}
......
app/Http/Requests/Validators/Api/MobileWeb/OrderListValidator.php
浏览文件 @ ef2199b3
......@@ -44,16 +44,16 @@ class OrderListValidator extends FormRequest
{
// 自定义错误消息
$messages = [
'deor_id.required' => '请输入设计工单id',
'deor_id.integer' => '参数错误',
'sys_num.required' => '请输入订单单号',
'sys_num.max' => '参数错误',
'id.required' => '请输入订单id',
'id.integer' => '参数错误',
'stauas.required' => '请输入列表状态',
'stauas.integer' => '参数错误',
];
// 数据验证
$validator = Validator::make($data, [
'deor_id' => 'required|integer|min:1',
'sys_num' => 'required|string|max:50',
'id' => 'required|integer|min:1',
'stauas' => 'required|integer|min:1',
], $messages);
// 判断数据验证是否成功
......@@ -134,6 +134,7 @@ class OrderListValidator extends FormRequest
return $validator->errors();
}
}
// 预约验证器
public function contactValidator($data)
{
......@@ -156,21 +157,66 @@ class OrderListValidator extends FormRequest
}
}
// 开始安装验证器
public function startInstallValidator($data)
// 改派验证器入口
public function transferOfOrderStartValidator($data)
{
// 自定义错误消息
$messages = [
'install_id.required' => '参数错误',
'admin_id.required' => '参数错误',
'id.required' => '请输入服务工单id',
'type.required' => '请输入请求类型',
'type.in' => '参数错误',
'id.required' => '请输入工单id',
'id.integer' => '参数错误',
'old_install_id.required' => '请输入原技师',
'old_install_id.integer' => '参数错误',
];
// 数据验证
$validator = Validator::make($data, [
'type' => [//1获取技师2改派
'required',
Rule::in(['1', '2']),
],
'id' => 'required|integer|min:1',
'old_install_id' => 'required|integer|min:1',
], $messages);
// 判断数据验证是否成功
if ($validator->fails()) {
return $validator->errors();
}
}
// 改派验证器
public function transferOfOrderValidator($data)
{
// 自定义错误消息
$messages = [
'receive_install_id.required' => '请选择安装人员',
'receive_install_id.integer' => '参数错误',
];
// 数据验证
$validator = Validator::make($data, [
'receive_install_id' => 'required|integer|min:1',
], $messages);
// 判断数据验证是否成功
if ($validator->fails()) {
return $validator->errors();
}
}
// 操作节点验证器
public function lineValidator($data)
{
// 自定义错误消息
$messages = [
'id.required' => '请输入工单id',
'id.integer' => '参数错误',
];
// 数据验证
$validator = Validator::make($data, [
'install_id' => 'required|integer|min:1',
'admin_id' => 'required|integer|min:1',
'id' => 'required|integer|min:1',
], $messages);
......
routes/api.php
浏览文件 @ ef2199b3
......@@ -1424,6 +1424,7 @@ 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/transferOfOrder', 'MobileWeb\OrderListController@transferOfOrder'); //改派
Route::post('w1/OrderList/contact', 'MobileWeb\OrderListController@contact'); //预约
Route::post('w1/OrderList/lineStart', 'MobileWeb\OrderListController@lineStart'); //出发
Route::post('w1/OrderList/lineArrive', 'MobileWeb\OrderListController@lineArrive'); //抵达
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论