Skip to content

Y
yhwx
提交 e25f7f85 authored 作者: 李大见's avatar 李大见
浏览文件
操作

维修项目修改

上级 3b11caaa
显示空白字符变更
内嵌 并排
正在显示 包含 506 行增加 和 274 行删除
app/Http/Controllers/Api/MemberManage/MemberListController.php
浏览文件 @ e25f7f85
...@@ -136,7 +136,7 @@ class MemberListController extends Controller ...@@ -136,7 +136,7 @@ class MemberListController extends Controller
// } // }
//按钮 //按钮
if ($value->mem_state == 1) { if ($value->mem_state == 1) {
$buttonData = ['info','setCare','edit','sendRecord','recharge', 'stop']; $buttonData = ['info','edit', 'stop'];
} }
if ($value->mem_state == 2) { if ($value->mem_state == 2) {
$buttonData[] = 'start'; $buttonData[] = 'start';
...@@ -239,31 +239,32 @@ class MemberListController extends Controller ...@@ -239,31 +239,32 @@ class MemberListController extends Controller
->where('mem_cid', $user_info->adm_cid) ->where('mem_cid', $user_info->adm_cid)
->where('mem_superior_shop_id', $shop_id) ->where('mem_superior_shop_id', $shop_id)
->where('mem_phone', $request['mem_phone']) ->where('mem_phone', $request['mem_phone'])
->where('mem_4sname', $request['mem_4sname'])
->first(['mem_id']); ->first(['mem_id']);
if ($find_mem) { if ($find_mem) {
return response()->json(['code' => 500, 'msg' => '当前手机号已存在', 'data' => '当前手机号已存在']); return response()->json(['code' => 500, 'msg' => '当前手机号已存在', 'data' => '当前手机号已存在']);
} }
if ($request['mem_car_num']) { // if ($request['mem_car_num']) {
// 判断车牌号是否存在 // // 判断车牌号是否存在
$find_meca = DB::table('member_car') // $find_meca = DB::table('member_car')
->where('meca_cid', $user_info->adm_cid) // ->where('meca_cid', $user_info->adm_cid)
->where('meca_superior_shop_id', $shop_id) // ->where('meca_superior_shop_id', $shop_id)
->where('meca_car_num', $request['mem_car_num']) // ->where('meca_car_num', $request['mem_car_num'])
->first(['meca_id']); // ->first(['meca_id']);
if ($find_meca) { // if ($find_meca) {
return response()->json(['code' => 500, 'msg' => '当前车牌号已存在', 'data' => '当前车牌号已存在']); // return response()->json(['code' => 500, 'msg' => '当前车牌号已存在', 'data' => '当前车牌号已存在']);
} // }
} // }
$mem_fid = 0; // $mem_fid = 0;
if ($request['mem_fphone']) { // if ($request['mem_fphone']) {
$mem_fid = DB::table('member') // $mem_fid = DB::table('member')
->where('mem_shop_id', $shop_id) // ->where('mem_shop_id', $shop_id)
->where('mem_phone', $request['mem_fphone']) // ->where('mem_phone', $request['mem_fphone'])
->value('mem_id'); // ->value('mem_id');
if (!$mem_fid) { // if (!$mem_fid) {
return response()->json(['code' => 500, 'msg' => '未查询到该推荐人', 'data' => '']); // return response()->json(['code' => 500, 'msg' => '未查询到该推荐人', 'data' => '']);
} // }
} // }
DB::beginTransaction(); DB::beginTransaction();
// 2 新增一个会员信息 // 2 新增一个会员信息
...@@ -275,7 +276,7 @@ class MemberListController extends Controller ...@@ -275,7 +276,7 @@ class MemberListController extends Controller
$mem_add_data['mem_create_name'] = $user_info->adm_name; $mem_add_data['mem_create_name'] = $user_info->adm_name;
$mem_add_data['mem_create_id'] = $user_info->adm_id; $mem_add_data['mem_create_id'] = $user_info->adm_id;
// $mem_add_data['mem_sex'] = $request['mem_sex']; // $mem_add_data['mem_sex'] = $request['mem_sex'];
$mem_add_data['mem_fid'] = $mem_fid; // $mem_add_data['mem_fid'] = $mem_fid;
$mem_add_data['mem_phone'] = $request['mem_phone']; $mem_add_data['mem_phone'] = $request['mem_phone'];
// $mem_add_data['mem_birthday'] = $request['mem_birthday'] ? $request['mem_birthday'] : ''; // $mem_add_data['mem_birthday'] = $request['mem_birthday'] ? $request['mem_birthday'] : '';
$mem_add_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']); $mem_add_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']);
...@@ -1542,4 +1543,25 @@ class MemberListController extends Controller ...@@ -1542,4 +1543,25 @@ class MemberListController extends Controller
$user_info = Common::getUserInfo($request['api_token']); $user_info = Common::getUserInfo($request['api_token']);
return MemberService::editOrderMember($user_info, $request, $request->ip()); return MemberService::editOrderMember($user_info, $request, $request->ip());
} }
/**|---------------------------------------------------------------------------------
* @name 订单编辑保险公司
* @param array $user_info 用户信息
* @param array $request 请求信息
* @retrun /multitype:array
* @author
* |---------------------------------------------------------------------------------
*/
public function editOrderBus ( Request $request ){
if ($request['edit_type'] == 2) {
// 验证数据
$verify_data = new WashOrderValidator;
$error_message = $verify_data->addBusinessAccValidator($request->all());
if ($error_message) {
return response()->json(['code' => 500, 'msg' => $error_message, 'data' => '参数错误', 'error_message' => $error_message]);
}
}
$user_info = Common::getUserInfo($request['api_token']);
return MemberService::editOrderBus($user_info, $request, $request->ip());
}
} }
app/Http/Controllers/Api/Workbench/CashierDeskController.php
浏览文件 @ e25f7f85
...@@ -3573,9 +3573,8 @@ class CashierDeskController extends Controller ...@@ -3573,9 +3573,8 @@ class CashierDeskController extends Controller
->where('mem_state', 1) ->where('mem_state', 1)
->where(function ($query) use ($search_data) { ->where(function ($query) use ($search_data) {
if (!empty($search_data['search_data'])) { if (!empty($search_data['search_data'])) {
$query->where('mem_name', 'like', '%' . $search_data['search_data'] . '%') $query->where('mem_name', $search_data['search_data'])
->orwhere('mem_car_num', 'like', '%' . $search_data['search_data'] . '%') ->orwhere('mem_phone', $search_data['search_data']);
->orwhere('mem_phone', 'like', '%' . $search_data['search_data'] . '%');
} }
}) })
->where(function ($query) use ($search_data) { ->where(function ($query) use ($search_data) {
...@@ -3634,8 +3633,8 @@ class CashierDeskController extends Controller ...@@ -3634,8 +3633,8 @@ class CashierDeskController extends Controller
->where('buac_state', 1) ->where('buac_state', 1)
->where(function ($query) use ($search_data) { ->where(function ($query) use ($search_data) {
if (!empty($search_data['search_data'])) { if (!empty($search_data['search_data'])) {
$query->where('buac_name', 'like', '%' . $search_data['search_data'] . '%') $query->where('buac_name', $search_data['search_data'])
->orwhere('buac_phone', 'like', '%' . $search_data['search_data'] . '%'); ->orwhere('buac_phone', $search_data['search_data']);
} }
}) })
->where(function ($query) use ($search_data) { ->where(function ($query) use ($search_data) {
......
app/Http/Controllers/Mounting/Business/WashOrderController.php
浏览文件 @ e25f7f85
...@@ -78,7 +78,7 @@ class WashOrderController extends Controller ...@@ -78,7 +78,7 @@ class WashOrderController extends Controller
// 获取当前列表下的按钮 // 获取当前列表下的按钮
$list_button = getListButton($request['api_token'], $request['pri_id']); $list_button = getListButton($request['api_token'], $request['pri_id']);
//获取top按钮 //获取top按钮
$sea_button_data = 'createBill,export,orderType,basicSet,leadOpenBill'; $sea_button_data = 'createBill,export,orderType,basicSet,leadOpenBill,batchEditAdmin';
$top_button = CommonService::getTopButton('',$sea_button_data,$list_button); $top_button = CommonService::getTopButton('',$sea_button_data,$list_button);
return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$search_data, 'list_button'=>$list_button, 'top_button'=>$top_button, 'ch_data'=>$ch_data]); return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$search_data, 'list_button'=>$list_button, 'top_button'=>$top_button, 'ch_data'=>$ch_data]);
} }
...@@ -2635,4 +2635,74 @@ class WashOrderController extends Controller ...@@ -2635,4 +2635,74 @@ class WashOrderController extends Controller
return response()->json(['code' => 500, 'msg' => '上传有误，请重新上传！', 'data' => '上传有误，请重新上传！']); return response()->json(['code' => 500, 'msg' => '上传有误，请重新上传！', 'data' => '上传有误，请重新上传！']);
} }
} }
/**
* 批量修改技师
*/
public function batchEditAdmin(Request $request) {
// 获取当前操作账号信息
$user_info = Common::getUserInfo($request['api_token']);
// 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id
$shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id;
if ($request['wor_state'] == 5) {
$wotp_work_type = 1;
}
if ($request['wor_state'] == 7) {
$wotp_work_type = 2;
}
if ($request['wor_state'] == 9) {
$wotp_work_type = 3;
}
if ($request['type'] == 1) {
if (!in_array($request['wor_state'], [5,7,9])) {
return response()->json(['code' => 500, 'msg' => '施工状态错误', 'data' => '施工状态错误']);
}
$find_work = DB::table('work_order')
->leftJoin('order', 'ord_id', '=', 'wor_order_id')
->leftJoin('order_client', 'orcl_ord_id', '=', 'ord_id')
->leftJoin('wash_work_technician_part', 'wotp_wor_id', '=', 'wor_id')
->where('wor_shop_id', $shop_id)
->where('wor_state', $request['wor_state'])
->where('wotp_work_type', $wotp_work_type)
->where('wotp_service_adm_id', $request['adm_id'])
->select('ord_id', 'wor_id', 'ord_order_number', 'wor_number', 'wotp_service_adm_name', 'wor_state', 'orcl_4sname', 'orcl_business_name', 'ord_other_system_number')
->get();
if ($find_work) {
foreach ($find_work as $key=>$value) {
if ($value->wor_state == 5) {
$find_work[$key]->wor_state_name = '待验件';
}
if ($value->wor_state == 7) {
$find_work[$key]->wor_state_name = '施工中';
}
if ($value->wor_state == 9) {
$find_work[$key]->wor_state_name = '还件';
}
$orgo_data = DB::table('order_goods')
->where('orgo_ord_id', $value->ord_id)
->select('orgo_goo_name')
->get();
$orgo_goo_name = array_column(json_decode(json_encode($orgo_data,true),true), 'orgo_goo_name');
$find_work[$key]->orgo_goo_name = implode(',',$orgo_goo_name);
}
}
return response()->json(['code' => 200, 'msg' =>'', 'data' =>$find_work]);
}
$find_adm = DB::table('admin')
->where('adm_id', $request['wotp_service_adm_id'])
->first();
if (!$find_adm) {
return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'未查询到此技师', 'data'=>''];
}
$res = DB::table('wash_work_technician_part')
->whereIn('wotp_wor_id', $request['wor_id'])
->where('wotp_work_type', $wotp_work_type)
->update(['wotp_service_adm_id'=>$request['wotp_service_adm_id'], 'wotp_service_adm_name'=>$find_adm->adm_name, 'wotp_service_adm_phone'=>$find_adm->adm_phone]);
if ($res) {
return response()->json(['code' => 200, 'msg' =>'操作成功', 'data' =>'']);
} else {
return response()->json(['code' => 500, 'msg' =>'操作失败', 'data' =>'']);
}
}
} }
app/Http/Controllers/Mounting/Operation/BusinessController.php
浏览文件 @ e25f7f85
...@@ -118,9 +118,10 @@ class BusinessController extends Controller ...@@ -118,9 +118,10 @@ class BusinessController extends Controller
$exist = BusinessService::phoneExists($user_info, $request->all(), 0); $exist = BusinessService::phoneExists($user_info, $request->all(), 0);
if ($exist == 1) { if ($exist == 1) {
return $this->error('该手机号已绑定在合作单位内', ErrorInc::DATA_EXIST); return $this->error('该手机号已绑定在合作单位内', ErrorInc::DATA_EXIST);
} elseif ($exist == 2) {
return $this->error('该手机号已绑定其他汽车美装，暂不能绑定', ErrorInc::DATA_EXIST);
} }
// elseif ($exist == 2) {
// return $this->error('该手机号已绑定其他汽车美装，暂不能绑定', ErrorInc::DATA_EXIST);
// }
$res = BusinessService::addAccount($user_info, $request->all()); $res = BusinessService::addAccount($user_info, $request->all());
if ($res) { if ($res) {
DB::commit(); DB::commit();
......
app/Http/Controllers/WeChatApplet/Technician/MemberController.php
浏览文件 @ e25f7f85
...@@ -33,7 +33,7 @@ class MemberController extends Controller ...@@ -33,7 +33,7 @@ class MemberController extends Controller
if (isset($request['mem_id']) && !empty($request['mem_id'])) { if (isset($request['mem_id']) && !empty($request['mem_id'])) {
$list_data = DB::table('member') $list_data = DB::table('member')
->where('mem_id', $request['mem_id']) ->where('mem_id', $request['mem_id'])
->select('mem_name', 'mem_id', 'mem_phone', 'mem_car_num', 'mem_car_series', 'mem_car_color', 'mem_source', 'mem_sex') ->select('mem_name', 'mem_id', 'mem_phone', 'mem_car_num', 'mem_car_series', 'mem_car_color', 'mem_source', 'mem_sex', 'mem_4sname')
->first(); ->first();
if ($list_data) { if ($list_data) {
$list_data->mem_car_num = DB::table('member_car') $list_data->mem_car_num = DB::table('member_car')
......
app/Http/Controllers/WeChatApplet/Technician/ServiceProjectController.php
浏览文件 @ e25f7f85
...@@ -167,7 +167,7 @@ class ServiceProjectController extends Controller ...@@ -167,7 +167,7 @@ class ServiceProjectController extends Controller
if (($request['pri_id']!=96 && $list_data) || ($request['pri_id']==96 && $list_data['data'])) { if (($request['pri_id']!=96 && $list_data) || ($request['pri_id']==96 && $list_data['data'])) {
return response()->json(['code' => 200, 'msg' => 'success', 'data' => $list_data, 'addProject'=>$addProject, 'editProject'=>$editProject]); return response()->json(['code' => 200, 'msg' => 'success', 'data' => $list_data, 'addProject'=>$addProject, 'editProject'=>$editProject]);
} else { } else {
return response()->json(['code' => 200, 'msg' => '暂无数据', 'data' => [], 'addProject'=>$addProject, 'editProject'=>$editProject]); return response()->json(['code' => 200, 'msg' => '暂无数据', 'data' => [], 'addProject'=>$addProject, 'editProject'=>$editProject, 'list_button'=>$list_button]);
} }
} }
/** /**
......
app/Http/Controllers/WeChatApplet/Technician/WashOrderController.php
浏览文件 @ e25f7f85
...@@ -747,7 +747,7 @@ class WashOrderController extends Controller ...@@ -747,7 +747,7 @@ class WashOrderController extends Controller
->leftJoin('weixin_user as wx', 'ussh.ussh_weus_id', '=', 'wx.weus_id') ->leftJoin('weixin_user as wx', 'ussh.ussh_weus_id', '=', 'wx.weus_id')
->leftJoin('member_car as mc', 'mc.meca_mem_id', '=', 'm.mem_id') ->leftJoin('member_car as mc', 'mc.meca_mem_id', '=', 'm.mem_id')
->whereRaw($where) ->whereRaw($where)
->select('mem_id', 'mem_name', 'mem_phone', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_bership', 'mem_car_series', 'mem_source', 'weus_headimgurl', 'mem_sex', 'mem_car_color', 'mem_rec_banlance', 'mem_gift_banlance', 'meca_car_num', 'mem_level','mem_initial') ->select('mem_id', 'mem_name', 'mem_phone', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_bership', 'mem_car_series', 'mem_source', 'weus_headimgurl', 'mem_sex', 'mem_car_color', 'mem_rec_banlance', 'mem_gift_banlance', 'meca_car_num', 'mem_level','mem_initial', 'mem_4sname')
->groupBy('mem_id'); ->groupBy('mem_id');
if(empty($search_data['page'])){ if(empty($search_data['page'])){
$list = $list_data $list = $list_data
...@@ -777,7 +777,6 @@ class WashOrderController extends Controller ...@@ -777,7 +777,6 @@ class WashOrderController extends Controller
}else { }else {
$list[$key]->firstLetter = $value->mem_initial; $list[$key]->firstLetter = $value->mem_initial;
} }
//
//折扣 //折扣
$list[$key]->discount = ''; $list[$key]->discount = '';
if(isset($meml_discount[$value->mem_level])){ if(isset($meml_discount[$value->mem_level])){
......
app/Http/Controllers/WeChatApplet/Technician/WashWorkController.php
浏览文件 @ e25f7f85
...@@ -393,9 +393,9 @@ class WashWorkController extends Controller ...@@ -393,9 +393,9 @@ class WashWorkController extends Controller
} }
} }
if(in_array($value->ord_wor_state, [1])){ if(in_array($value->ord_wor_state, [1])){
if($value->ord_type!=3) { // if($value->ord_type!=3) {
$buttonData[] = 'setService'; // $buttonData[] = 'setService';
} // }
$buttonData[] = 'newCreateWork'; $buttonData[] = 'newCreateWork';
} }
if(!in_array('phone', $pri_operate_method) && $value->ord_wor_state != 7){ if(!in_array('phone', $pri_operate_method) && $value->ord_wor_state != 7){
......
app/Http/Requests/Validators/Business/WashOrderValidator.php
浏览文件 @ e25f7f85
...@@ -977,7 +977,7 @@ class WashOrderValidator extends FormRequest ...@@ -977,7 +977,7 @@ class WashOrderValidator extends FormRequest
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'mem_name' => 'required|max:80', 'mem_name' => 'required|max:80',
'mem_phone' => 'required', 'mem_phone' => 'required',
'mem_car_num' => 'required', // 'mem_car_num' => 'required',
// 'mem_car_series' => 'required', // 'mem_car_series' => 'required',
], $messages); ], $messages);
...@@ -1003,7 +1003,7 @@ class WashOrderValidator extends FormRequest ...@@ -1003,7 +1003,7 @@ class WashOrderValidator extends FormRequest
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'buac_name' => 'required|max:80', 'buac_name' => 'required|max:80',
'buac_phone' => 'required', 'buac_phone' => 'required',
'buac_password' => 'required', // 'buac_password' => 'required',
'buac_bucl_id' => 'required', 'buac_bucl_id' => 'required',
], $messages); ], $messages);
......
app/Http/Requests/Validators/WeChatApplet/Technician/MemberValidator.php
浏览文件 @ e25f7f85
...@@ -35,7 +35,7 @@ class MemberValidator extends FormRequest ...@@ -35,7 +35,7 @@ class MemberValidator extends FormRequest
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'type' => 'required', 'type' => 'required',
'mem_id' => 'required|integer|min:1', 'mem_id' => 'required|integer|min:1',
'mem_car_num' => 'required|max:10', // 'mem_car_num' => 'required|max:10',
], $messages); ], $messages);
// 判断数据验证是否成功 // 判断数据验证是否成功
......
app/Services/Business/WashOrderBasicService.php
浏览文件 @ e25f7f85
...@@ -157,25 +157,25 @@ class WashOrderBasicService extends Service ...@@ -157,25 +157,25 @@ class WashOrderBasicService extends Service
$data['ord_create_id'] = $user_info->adm_id; $data['ord_create_id'] = $user_info->adm_id;
$data['ord_client_id'] = isset($request['ord_client_id']) ? $request['ord_client_id'] : 0; $data['ord_client_id'] = isset($request['ord_client_id']) ? $request['ord_client_id'] : 0;
$data['ord_ware_id'] = $request['ware_id'] ? $request['ware_id'] : ''; $data['ord_ware_id'] = $request['ware_id'] ? $request['ware_id'] : '';
if ($request['ord_address_type'] == 1) { //本店
$ord_address = DB::table('shop') $ord_address = DB::table('shop')
->where('shop_id', $request['ord_address_id']) ->where('shop_id', $request['ord_address_id'])
->value('shop_store_name'); ->value('shop_store_name');
if ($request['ord_address'] != ($ord_address . '(本店)')) { // if ($request['ord_address_type'] == 1) { //本店
return ['code' => ErrorInc::REQUEST_INAPTNESS, 'msg' => '施工门店错误1', 'data' => '']; // if ($request['ord_address'] != ($ord_address . '(本店)')) {
} // return ['code' => ErrorInc::REQUEST_INAPTNESS, 'msg' => '施工门店错误1', 'data' => ''];
} elseif ($request['ord_address_type'] == 2) { //合作商 // }
$ord_address = DB::table('business_client') // } elseif ($request['ord_address_type'] == 2) { //合作商
->where('bucl_id', $request['ord_address_id']) // $ord_address = DB::table('business_client')
->value('bucl_name'); // ->where('bucl_id', $request['ord_address_id'])
if ($request['ord_address'] != $ord_address) { // ->value('bucl_name');
return ['code' => ErrorInc::REQUEST_INAPTNESS, 'msg' => '施工门店错误', 'data' => '']; // if ($request['ord_address'] != $ord_address) {
} // return ['code' => ErrorInc::REQUEST_INAPTNESS, 'msg' => '施工门店错误', 'data' => ''];
} elseif ($request['ord_address_type'] == 3) { //分店 // }
$ord_address = DB::table('shop') // } elseif ($request['ord_address_type'] == 3) { //分店
->where('shop_id', $request['ord_address_id']) // $ord_address = DB::table('shop')
->value('shop_store_name'); // ->where('shop_id', $request['ord_address_id'])
} // ->value('shop_store_name');
// }
$request['ord_type'] = isset($request['ord_type']) ? $request['ord_type'] : 0; $request['ord_type'] = isset($request['ord_type']) ? $request['ord_type'] : 0;
$data['ord_other_system_number'] = $request['ord_other_system_number']??''; $data['ord_other_system_number'] = $request['ord_other_system_number']??'';
$data['ord_address'] = $request['ord_address']; $data['ord_address'] = $request['ord_address'];
...@@ -1592,7 +1592,7 @@ class WashOrderBasicService extends Service ...@@ -1592,7 +1592,7 @@ class WashOrderBasicService extends Service
} }
//企业信息 //企业信息
$type_id =isset($request['ord_client_id']) ? $request['ord_client_id'] : 0; $type_id =isset($request['ord_client_id']) ? $request['ord_client_id'] : 0;
$type_name = isset($request['orcl_business_name']) ? $request['orcl_business_name'] : $request['orcl_name']; $type_name = isset($request['orcl_name']) ? $request['orcl_name'] : '';
$rece_params = [ $rece_params = [
'recpay_type'=>1,//类型：1销售订单2充值卡 'recpay_type'=>1,//类型：1销售订单2充值卡
'recpay_original_id'=>$ord_id,//订单id 'recpay_original_id'=>$ord_id,//订单id
......
app/Services/Business/WashOrderService.php
浏览文件 @ e25f7f85
...@@ -260,7 +260,7 @@ class WashOrderService extends Service ...@@ -260,7 +260,7 @@ class WashOrderService extends Service
} }
} }
}) })
->select('ord_id', 'ord_order_number', 'ord_actual_price', 'ord_type', 'ord_order_state', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'ord_create_time', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_order_price', 'orcl_client_id', 'orcl_appoint_time', 'orcl_car_brand_series', 'orcl_car_vin', 'orcl_sales_adm_id', 'ord_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'orcl_business_name', 'ord_shop_id', 'ord_address_type', 'ord_address_id', 'ord_service_type', 'ord_settlement_time', 'ord_settlement_adm_id', 'ord_payment_way', 'orcl_mem_source', 'orcl_carbrse_type', 'ord_explain', 'ord_create_id', 'ord_ware_id','ord_pay_state','ord_zero_price','ord_source', 'ord_other_order_num','ord_other_system_number','orcl_province','orcl_city','orcl_county','orcl_address', 'ord_add_type', 'ord_customer_state', 'ord_client_id','ord_new_type', 'ord_suspended', 'ord_suspended_time', 'ord_openbill', 'ord_openbill_number', 'ord_openbill_image', 'wor_state', 'orcl_buac_name','orcl_buac_phone', 'orcl_4sname', 'wor_id') ->select('ord_id', 'ord_order_number', 'ord_actual_price', 'ord_type', 'ord_order_state', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'ord_create_time', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_order_price', 'orcl_client_id', 'orcl_appoint_time', 'orcl_car_brand_series', 'orcl_car_vin', 'orcl_sales_adm_id', 'ord_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'orcl_business_name', 'ord_shop_id', 'ord_address_type', 'ord_address_id', 'ord_service_type', 'ord_settlement_time', 'ord_settlement_adm_id', 'ord_payment_way', 'orcl_mem_source', 'orcl_carbrse_type', 'ord_explain', 'ord_create_id', 'ord_ware_id','ord_pay_state','ord_zero_price','ord_source', 'ord_other_order_num','ord_other_system_number','orcl_province','orcl_city','orcl_county','orcl_address', 'ord_add_type', 'ord_customer_state', 'ord_client_id','ord_new_type', 'ord_suspended', 'ord_suspended_time', 'ord_openbill', 'ord_openbill_number', 'ord_openbill_image', 'wor_state', 'orcl_buac_name','orcl_buac_phone', 'orcl_4sname', 'wor_id', 'orcl_buac_id', 'orcl_business_id')
->orderByRaw("FIELD(ord_wor_state, 11)") ->orderByRaw("FIELD(ord_wor_state, 11)")
->orderBy('ord_id', $orderby_type) ->orderBy('ord_id', $orderby_type)
->groupBy('ord_id') ->groupBy('ord_id')
...@@ -485,6 +485,7 @@ class WashOrderService extends Service ...@@ -485,6 +485,7 @@ class WashOrderService extends Service
} }
$status_name = $all_status[$new_ord_wor_state]??''; $status_name = $all_status[$new_ord_wor_state]??'';
$list_items[$key]->ord_wor_state_name = $status_name; $list_items[$key]->ord_wor_state_name = $status_name;
$list_items[$key]->ord_actual_price = ($value->ord_state==1) ? $value->ord_order_price:$value->ord_actual_price;
if ($value->ord_suspended == 1) { if ($value->ord_suspended == 1) {
$list_items[$key]->ord_wor_state_name = '已挂起'; $list_items[$key]->ord_wor_state_name = '已挂起';
} }
...@@ -589,7 +590,17 @@ class WashOrderService extends Service ...@@ -589,7 +590,17 @@ class WashOrderService extends Service
if ($value_b['pri_id'] == 888 && $value->ord_wor_state == 2 && $wor_state == 2) {//重新派单工单 if ($value_b['pri_id'] == 888 && $value->ord_wor_state == 2 && $wor_state == 2) {//重新派单工单
$list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
} }
if ($value_b['pri_id'] == 889 && $value->ord_wor_state == 2 && $wor_state == 2) {//取消工单 if ($value_b['pri_id'] == 889 && $value->ord_wor_state == 2 && ($wor_state == 2 || $wor_state == 5)) {//取消工单
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 891 && $value->ord_wor_state == 2 && ($wor_state == 3 || $wor_state == 5)) {//撤回工单
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 892 && $value->ord_wor_state == 2 && $wor_state == 8) {//施工审核工单
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 893 && $value->ord_wor_state == 2 && $wor_state > 9 && $wor_state != 11) {//绩效核算
$list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
} }
if ($value->ord_wor_state == 2 || $value->ord_wor_state == 4 || $value->ord_wor_state == 20) {//售后 if ($value->ord_wor_state == 2 || $value->ord_wor_state == 4 || $value->ord_wor_state == 20) {//售后
...@@ -600,9 +611,12 @@ class WashOrderService extends Service ...@@ -600,9 +611,12 @@ class WashOrderService extends Service
$work_order = DB::table('work_order') $work_order = DB::table('work_order')
->where('wor_order_id',$value->ord_id) ->where('wor_order_id',$value->ord_id)
->value('wor_state'); ->value('wor_state');
// if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 873 && in_array($value->ord_type, [0,1])) { if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 873 && in_array($value->ord_type, [0,1])) {
// $list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
// } }
if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 895 && in_array($value->ord_type, [0,1])) {
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value->ord_wor_state == 1 && $value_b['pri_id'] == 589 && $value->ord_source != 5) {//编辑 if ($value->ord_wor_state == 1 && $value_b['pri_id'] == 589 && $value->ord_source != 5) {//编辑
$list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
} }
...@@ -6134,133 +6148,134 @@ class WashOrderService extends Service ...@@ -6134,133 +6148,134 @@ class WashOrderService extends Service
if ($find_mem) { if ($find_mem) {
return ["code"=>500, 'msg'=>'当前手机号已存在', 'data'=>'当前手机号已存在']; return ["code"=>500, 'msg'=>'当前手机号已存在', 'data'=>'当前手机号已存在'];
} }
if ($request['mem_car_num']) { // if ($request['mem_car_num']) {
// 判断车牌号是否存在 // // 判断车牌号是否存在
$find_meca = DB::table('member_car') // $find_meca = DB::table('member_car')
->where('meca_cid', $user_info->adm_cid) // ->where('meca_cid', $user_info->adm_cid)
->where('meca_superior_shop_id', $user_info->adm_shop_id) // ->where('meca_superior_shop_id', $user_info->adm_shop_id)
->where('meca_car_num', $request['mem_car_num']) // ->where('meca_car_num', $request['mem_car_num'])
->first(['meca_id']); // ->first(['meca_id']);
if ($find_meca) { // if ($find_meca) {
return ["code"=>500, 'msg'=>'当前车牌号已存在', 'data'=>'当前车牌号已存在']; // return ["code"=>500, 'msg'=>'当前车牌号已存在', 'data'=>'当前车牌号已存在'];
} // }
} // }
$mem_fid = 0; $mem_fid = 0;
if ($request['mem_fphone']) { // if ($request['mem_fphone']) {
$mem_fid = DB::table('member') // $mem_fid = DB::table('member')
->where('mem_shop_id', $user_info->adm_shop_id) // ->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_phone', $request['mem_fphone']) // ->where('mem_phone', $request['mem_fphone'])
->value('mem_id'); // ->value('mem_id');
if (!$mem_fid) { // if (!$mem_fid) {
return ['code' => 500, 'msg' => '未查询到该邀请人', 'data' => '']; // return ['code' => 500, 'msg' => '未查询到该邀请人', 'data' => ''];
} // }
} // }
// 2 新增一个会员信息 // 2 新增一个会员信息
$mem_add_data['mem_cid'] = $user_info->adm_cid; $mem_add_data['mem_cid'] = $user_info->adm_cid;
$mem_add_data['mem_shop_id'] = $user_info->adm_shop_id; $mem_add_data['mem_shop_id'] = $user_info->adm_shop_id;
$mem_add_data['mem_superior_shop_id'] = $user_info->adm_shop_id; $mem_add_data['mem_superior_shop_id'] = $user_info->adm_shop_id;
$mem_add_data['mem_name'] = $request['mem_name']; $mem_add_data['mem_name'] = $request['mem_name'];
$mem_add_data['mem_sex'] = $request['mem_sex']; $mem_add_data['mem_4sname'] = $request['mem_4sname'];
$mem_add_data['mem_fid'] = $mem_fid; // $mem_add_data['mem_sex'] = $request['mem_sex'];
// $mem_add_data['mem_fid'] = $mem_fid;
$mem_add_data['mem_create_name'] = $user_info->adm_name; $mem_add_data['mem_create_name'] = $user_info->adm_name;
$mem_add_data['mem_create_id'] = $user_info->adm_id; $mem_add_data['mem_create_id'] = $user_info->adm_id;
$mem_add_data['mem_phone'] = $request['mem_phone']; $mem_add_data['mem_phone'] = $request['mem_phone'];
$mem_add_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']); // $mem_add_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']);
$mem_add_data['mem_car_series'] = $request['mem_car_series'] ? $request['mem_car_series'] : ''; // $mem_add_data['mem_car_series'] = $request['mem_car_series'] ? $request['mem_car_series'] : '';
$mem_add_data['mem_source'] = $request['mem_source'] ? $request['mem_source'] : ''; // $mem_add_data['mem_source'] = $request['mem_source'] ? $request['mem_source'] : '';
$mem_add_data['mem_car_color'] = $request['mem_car_color'] ? $request['mem_car_color'] : ''; // $mem_add_data['mem_car_color'] = $request['mem_car_color'] ? $request['mem_car_color'] : '';
// $mem_id = DB::table('member')->insertGetId($mem_add_data); // $mem_id = DB::table('member')->insertGetId($mem_add_data);
$mem_id = MemberService::addMember($mem_add_data); $mem_id = MemberService::addMember($mem_add_data);
if ($mem_fid) { // if ($mem_fid) {
$add_data_bind['bilo_shop_id'] = $user_info->adm_shop_id; // $add_data_bind['bilo_shop_id'] = $user_info->adm_shop_id;
$add_data_bind['bilo_Inviter_id'] = $mem_fid; // $add_data_bind['bilo_Inviter_id'] = $mem_fid;
$add_data_bind['bilo_Invitee_id'] = $mem_id; // $add_data_bind['bilo_Invitee_id'] = $mem_id;
$add_data_bind['bilo_state'] = 1; // $add_data_bind['bilo_state'] = 1;
$add_data_bind['bilo_create_time'] = date('Y-m-d H:i:s'); // $add_data_bind['bilo_create_time'] = date('Y-m-d H:i:s');
$add_data_bind['bilo_update_time'] = date('Y-m-d H:i:s'); // $add_data_bind['bilo_update_time'] = date('Y-m-d H:i:s');
$add_res = DB::table('bind_log')->insertGetId($add_data_bind); // $add_res = DB::table('bind_log')->insertGetId($add_data_bind);
} // }
// $mem_id = DB::table('member')->insertGetId($mem_add_data); // // $mem_id = DB::table('member')->insertGetId($mem_add_data);
self::addFestival($mem_id,$user_info);//新增节日提醒 // self::addFestival($mem_id,$user_info);//新增节日提醒
// 3.新增一个车辆信息 // 3.新增一个车辆信息
if ($request['mem_car_num']) { // if ($request['mem_car_num']) {
$meca_add_data['meca_cid'] = $user_info->adm_cid; // $meca_add_data['meca_cid'] = $user_info->adm_cid;
$meca_add_data['meca_shop_id'] = $user_info->adm_shop_id; // $meca_add_data['meca_shop_id'] = $user_info->adm_shop_id;
$meca_add_data['meca_superior_shop_id'] = $user_info->adm_shop_id; // $meca_add_data['meca_superior_shop_id'] = $user_info->adm_shop_id;
$meca_add_data['meca_create_adm_id'] = $user_info->adm_id; // $meca_add_data['meca_create_adm_id'] = $user_info->adm_id;
$meca_add_data['meca_mem_id'] = $mem_id; // $meca_add_data['meca_mem_id'] = $mem_id;
$meca_add_data['meca_car_num'] = $request['mem_car_num']; // $meca_add_data['meca_car_num'] = $request['mem_car_num'];
$meca_add_data['meca_car_series'] = $request['mem_car_series'] ? $request['mem_car_series'] : ''; // $meca_add_data['meca_car_series'] = $request['mem_car_series'] ? $request['mem_car_series'] : '';
$meca_res = DB::table('member_car')->insert($meca_add_data); // $meca_res = DB::table('member_car')->insert($meca_add_data);
} else { // } else {
$meca_res = true; // $meca_res = true;
} // }
// 查询手机号是否存在 // 查询手机号是否存在
$find_weixin_data = DB::table('weixin_user') // $find_weixin_data = DB::table('weixin_user')
->where('weus_phone', $request['mem_phone']) // ->where('weus_phone', $request['mem_phone'])
->select('weus_id', 'weus_phone', 'weus_nickmame', 'weus_headimgurl') // ->select('weus_id', 'weus_phone', 'weus_nickmame', 'weus_headimgurl')
->first(); // ->first();
if (empty($find_weixin_data)) { // if (empty($find_weixin_data)) {
// 不存在就新增用户 // // 不存在就新增用户
$data['weus_phone'] = $request['mem_phone']; // $data['weus_phone'] = $request['mem_phone'];
$data['weus_openid'] = $mem_id; // $data['weus_openid'] = $mem_id;
$data['weus_nickmame'] = $request['mem_name']; // $data['weus_nickmame'] = $request['mem_name'];
$data['weus_follow'] = 1; // $data['weus_follow'] = 1;
$data['weus_sex'] = 0; // $data['weus_sex'] = 0;
$data['weus_headimgurl'] = ''; // $data['weus_headimgurl'] = '';
$data['weus_update_time'] = date('Y-m-d H:i:s'); // $data['weus_update_time'] = date('Y-m-d H:i:s');
$weus_id = DB::table('weixin_user')->insertGetId($data); // $weus_id = DB::table('weixin_user')->insertGetId($data);
if (!$weus_id) { // if (!$weus_id) {
return ['code'=>500, 'msg'=>'新增失败', 'data'=>'']; // return ['code'=>500, 'msg'=>'新增失败', 'data'=>''];
} // }
unset($data['weus_update_time']); // unset($data['weus_update_time']);
} else { // } else {
// 更新微信用户信息 // // 更新微信用户信息
$edit_weus['weus_phone'] = $request['mem_phone']; // $edit_weus['weus_phone'] = $request['mem_phone'];
$edit_weus['weus_nickmame'] = $request['mem_name']; // $edit_weus['weus_nickmame'] = $request['mem_name'];
if (!empty($request['weus_headimgurl'])) { // if (!empty($request['weus_headimgurl'])) {
$edit_weus['weus_headimgurl'] = $request['weus_headimgurl']; // $edit_weus['weus_headimgurl'] = $request['weus_headimgurl'];
} // }
$edit_weus['weus_update_time'] = date('Y-m-d H:i:s'); // $edit_weus['weus_update_time'] = date('Y-m-d H:i:s');
$edit_weus_res = DB::table('weixin_user') // $edit_weus_res = DB::table('weixin_user')
->where('weus_id', $find_weixin_data->weus_id) // ->where('weus_id', $find_weixin_data->weus_id)
->update($edit_weus); // ->update($edit_weus);
unset($edit_weus); // unset($edit_weus);
$weus_id = $find_weixin_data->weus_id; // $weus_id = $find_weixin_data->weus_id;
} // }
// 查询微信用户与门店的关系是否存在绑定关系 // 查询微信用户与门店的关系是否存在绑定关系
$find_user_shop_data = DB::table('user_shop') // $find_user_shop_data = DB::table('user_shop')
->where('ussh_weus_id', $weus_id) // ->where('ussh_weus_id', $weus_id)
->where('ussh_shop_id', $user_info->adm_shop_id) // ->where('ussh_shop_id', $user_info->adm_shop_id)
->select('ussh_id', 'ussh_user_id', 'ussh_user_type', 'ussh_phone') // ->select('ussh_id', 'ussh_user_id', 'ussh_user_type', 'ussh_phone')
->first(); // ->first();
if (empty($find_user_shop_data)) { // if (empty($find_user_shop_data)) {
// // 用户没有与当前门店绑定，把用户与当前门店绑定 // // // 用户没有与当前门店绑定，把用户与当前门店绑定
// $ussh_data['ussh_user_id'] = $mem_id; // // $ussh_data['ussh_user_id'] = $mem_id;
// $ussh_data['ussh_weus_id'] = $weus_id; // // $ussh_data['ussh_weus_id'] = $weus_id;
// $ussh_data['ussh_shop_id'] = $user_info->adm_shop_id; // // $ussh_data['ussh_shop_id'] = $user_info->adm_shop_id;
// // $ussh_data['ussh_user_type'] = 1;
// // $ussh_data['ussh_phone'] = $request['mem_phone'];
// // $ussh_data['ussh_create_time'] = date('Y-m-d H:i:s');
// // $ussh_data['ussh_register_time'] = date('Y-m-d H:i:s');
// // $ussh_id = DB::table('user_shop')->insertGetId($ussh_data);
// // if (!$ussh_id) {
// // return ['code'=>500, 'msg'=>'新增失败2', 'data'=>''];
// // }
// } else {
// if (empty($find_user_shop_data->ussh_user_id)) {
// $ussh_data['ussh_user_type'] = 1; // $ussh_data['ussh_user_type'] = 1;
// $ussh_data['ussh_phone'] = $request['mem_phone']; // $ussh_data['ussh_phone'] = $request['mem_phone'];
// $ussh_data['ussh_create_time'] = date('Y-m-d H:i:s'); // $ussh_data['ussh_create_time'] = date('Y-m-d H:i:s');
// $ussh_data['ussh_register_time'] = date('Y-m-d H:i:s'); // $ussh_id = DB::table('user_shop')
// $ussh_id = DB::table('user_shop')->insertGetId($ussh_data); // ->where('ussh_id', $find_user_shop_data->ussh_id)
// if (!$ussh_id) { // ->update($ussh_data);
// return ['code'=>500, 'msg'=>'新增失败2', 'data'=>''];
// } // }
} else { // }
if (empty($find_user_shop_data->ussh_user_id)) { if ($mem_id) {
$ussh_data['ussh_user_type'] = 1;
$ussh_data['ussh_phone'] = $request['mem_phone'];
$ussh_data['ussh_create_time'] = date('Y-m-d H:i:s');
$ussh_id = DB::table('user_shop')
->where('ussh_id', $find_user_shop_data->ussh_id)
->update($ussh_data);
}
}
if ($mem_id && $meca_res) {
$return_data['mem_id'] = $mem_id; $return_data['mem_id'] = $mem_id;
$list_data = DB::table('member as m') $list_data = DB::table('member as m')
->leftJoin('user_shop as ussh', 'ussh.ussh_user_id', '=', 'm.mem_id') ->leftJoin('user_shop as ussh', 'ussh.ussh_user_id', '=', 'm.mem_id')
...@@ -6289,14 +6304,14 @@ class WashOrderService extends Service ...@@ -6289,14 +6304,14 @@ class WashOrderService extends Service
if ($find_buac) { if ($find_buac) {
return ['code'=>500, 'msg'=>'success', 'data'=>'客户名称已存在，新增失败']; return ['code'=>500, 'msg'=>'success', 'data'=>'客户名称已存在，新增失败'];
} }
$password = md5($request['buac_password'] . 'faster123456'); // $password = md5($request['buac_password'] . 'faster123456');
// 2 新增一个企业会员账号 // 2 新增一个企业会员账号
$add_buac_data['buac_shop_id'] = $user_info->adm_shop_id; $add_buac_data['buac_shop_id'] = $user_info->adm_shop_id;
$add_buac_data['buac_cid'] = $user_info->adm_cid; $add_buac_data['buac_cid'] = $user_info->adm_cid;
$add_buac_data['buac_name'] = $request['buac_name']; $add_buac_data['buac_name'] = $request['buac_name'];
$add_buac_data['buac_phone'] = $request['buac_phone']; $add_buac_data['buac_phone'] = $request['buac_phone'];
$add_buac_data['buac_sex'] = $request['buac_sex']; // $add_buac_data['buac_sex'] = $request['buac_sex'];
$add_buac_data['buac_password'] = $password; // $add_buac_data['buac_password'] = $password;
$add_buac_data['buac_bucl_id'] = $request['buac_bucl_id']; $add_buac_data['buac_bucl_id'] = $request['buac_bucl_id'];
$add_buac_data['buac_create_adm_id'] = $user_info->adm_id; $add_buac_data['buac_create_adm_id'] = $user_info->adm_id;
$add_buac_data['buac_create_time'] = date('Y-m-d H:i:s'); $add_buac_data['buac_create_time'] = date('Y-m-d H:i:s');
...@@ -8022,9 +8037,9 @@ class WashOrderService extends Service ...@@ -8022,9 +8037,9 @@ class WashOrderService extends Service
$update_bucl['bucl_update_time'] = date('Y-m-d H:i:s'); $update_bucl['bucl_update_time'] = date('Y-m-d H:i:s');
$update_bucl_res = DB::table('business_client')->where('bucl_id', $find_mem->buac_bucl_id)->update($update_bucl); $update_bucl_res = DB::table('business_client')->where('bucl_id', $find_mem->buac_bucl_id)->update($update_bucl);
} }
if ($ord_edit_data['ord_actual_price'] > $ord_edit_data['ord_order_price']) { // if ($ord_edit_data['ord_actual_price'] > $ord_edit_data['ord_order_price']) {
return ['code'=>500, 'msg'=>'超出结算金额', 'data'=>'超出结算金额']; // return ['code'=>500, 'msg'=>'超出结算金额', 'data'=>'超出结算金额'];
} // }
if ($outstanding_amount == 0) { if ($outstanding_amount == 0) {
$ord_edit_data['ord_state'] = 2;//结算状态1未结算2已结算 $ord_edit_data['ord_state'] = 2;//结算状态1未结算2已结算
} elseif ($outstanding_amount == $all_price) { } elseif ($outstanding_amount == $all_price) {
......
app/Services/Business/WashWorkService.php
浏览文件 @ e25f7f85
...@@ -194,7 +194,7 @@ class WashWorkService extends Service ...@@ -194,7 +194,7 @@ class WashWorkService extends Service
->where('wor_address_id', $search_data['wor_address_id']); ->where('wor_address_id', $search_data['wor_address_id']);
} }
}) })
->select('wor_id', 'wor_number', 'wor_create_id', 'wor_order_number', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wor_remark', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_brand_series', 'wocl_pick_up_car_time', 'wor_create_time', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'wocl_carowner_name', 'wocl_carowner_phone', 'wocl_car_vin', 'wor_explain', 'wocl_bus_name', 'wor_address_id', 'wor_address_type', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_work_type', 'wor_other_audit', 'wor_order_id', 'wor_list_pic', 'ord_new_type','ord_state', 'wor_need_return') ->select('wor_id', 'wor_number', 'wor_create_id', 'wor_order_number', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wor_remark', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_brand_series', 'wocl_pick_up_car_time', 'wor_create_time', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'wocl_carowner_name', 'wocl_carowner_phone', 'wocl_car_vin', 'wor_explain', 'wocl_bus_name', 'wor_address_id', 'wor_address_type', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_work_type', 'wor_other_audit', 'wor_order_id', 'wor_list_pic', 'ord_new_type','ord_state', 'wor_need_return', 'ord_id')
->orderBy('wor_id', 'desc') ->orderBy('wor_id', 'desc')
->paginate($show_count); ->paginate($show_count);
...@@ -237,13 +237,7 @@ class WashWorkService extends Service ...@@ -237,13 +237,7 @@ class WashWorkService extends Service
} }
$ord_new_type = DB::table('order_type')->where('orty_shop_id',$user_info->adm_shop_id)->pluck('orty_name','orty_id')->toArray(); $ord_new_type = DB::table('order_type')->where('orty_shop_id',$user_info->adm_shop_id)->pluck('orty_name','orty_id')->toArray();
foreach ($list_items as $key => $value) { foreach ($list_items as $key => $value) {
// $ord_new_type = DB::table('order')
// ->leftJoin('order_type', 'orty_id', '=', 'ord_new_type')
// ->where('ord_id', $value->wor_order_id)
// ->select('ord_new_type','orty_name')
// ->first();
// $list_items[$key]->ord_new_type = $ord_new_type->ord_new_type;
// $list_items[$key]->ord_new_type_name = $ord_new_type->orty_name;
$list_items[$key]->ord_new_type_name = $ord_new_type[$value->ord_new_type] ?? '无标签'; $list_items[$key]->ord_new_type_name = $ord_new_type[$value->ord_new_type] ?? '无标签';
// 创建人 // 创建人
if ($value->wor_create_id && isset($find_adm[$value->wor_create_id])) { if ($value->wor_create_id && isset($find_adm[$value->wor_create_id])) {
...@@ -253,9 +247,6 @@ class WashWorkService extends Service ...@@ -253,9 +247,6 @@ class WashWorkService extends Service
} }
$list_items[$key]->service_adm_name = '';//组长 $list_items[$key]->service_adm_name = '';//组长
$list_items[$key]->team_members = '';//组员 $list_items[$key]->team_members = '';//组员
// if (isset($find_adm[$value->wor_service_adm_id])) {
// $list_items[$key]->service_adm_name = $find_adm[$value->wor_service_adm_id];
// }
$find_team_members = DB::table('wash_work_technician_part') $find_team_members = DB::table('wash_work_technician_part')
->where('wotp_wor_id', $value->wor_id) ->where('wotp_wor_id', $value->wor_id)
->select('wotp_service_adm_id', 'wotp_service_adm_name', 'wotp_work_type') ->select('wotp_service_adm_id', 'wotp_service_adm_name', 'wotp_work_type')
...@@ -1534,7 +1525,7 @@ class WashWorkService extends Service ...@@ -1534,7 +1525,7 @@ class WashWorkService extends Service
$query->where('wocl_check_car_state', $search_data['wocl_check_car_state']); $query->where('wocl_check_car_state', $search_data['wocl_check_car_state']);
} }
}) })
->select('wor_id', 'wor_number', 'wor_order_number', 'wor_shop_id', 'wor_create_id', 'wor_type', 'wor_state', 'wor_service_state', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_car_vehicle_type', 'wocl_car_vin', 'wocl_car_brand_series', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'wocl_carowner_phone', 'wocl_carowner_name', 'wor_explain as wor_remark', 'wocl_bus_name', 'shop_store_name', 'wor_address_type', 'wor_address_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_work_type', 'wor_order_id', 'wocl_client_id', 'wor_list_pic', 'ord_new_type') ->select('wor_id', 'wor_number', 'wor_order_number', 'wor_shop_id', 'wor_create_id', 'wor_type', 'wor_state', 'wor_service_state', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_car_vehicle_type', 'wocl_car_vin', 'wocl_car_brand_series', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'wocl_carowner_phone', 'wocl_carowner_name', 'wor_explain as wor_remark', 'wocl_bus_name', 'shop_store_name', 'wor_address_type', 'wor_address_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_work_type', 'wor_order_id', 'wocl_client_id', 'wor_list_pic', 'ord_new_type', 'ord_id')
->orderBy('wor_appoint_time', 'desc') ->orderBy('wor_appoint_time', 'desc')
->orderBy('wor_id', 'desc'); ->orderBy('wor_id', 'desc');
if($adm_leave == 1 || $all_work) { if($adm_leave == 1 || $all_work) {
...@@ -1571,6 +1562,19 @@ class WashWorkService extends Service ...@@ -1571,6 +1562,19 @@ class WashWorkService extends Service
->where('dego_order_type', 2) ->where('dego_order_type', 2)
->pluck('dego_pic', 'dego_wor_id')->toArray(); ->pluck('dego_pic', 'dego_wor_id')->toArray();
foreach ($list_items as $key => $value) { foreach ($list_items as $key => $value) {
$order_client = DB::table('order_client')
->where('orcl_ord_id', $value->ord_id)
->select('orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'orcl_name', 'orcl_phone')
->first();
if ($order_client) {
$order_client->orcl_business_name = $order_client->orcl_business_name??'--';
$order_client->orcl_buac_name = $order_client->orcl_buac_name??'--';
$order_client->orcl_buac_phone = $order_client->orcl_buac_phone??'--';
$order_client->orcl_4sname = $order_client->orcl_4sname??'--';
$order_client->orcl_name = $order_client->orcl_name??'--';
$order_client->orcl_phone = $order_client->orcl_phone??'--';
}
$list_items[$key]->order_client = $order_client;
$list_items[$key]->ord_new_type_name = DB::table('order_type') $list_items[$key]->ord_new_type_name = DB::table('order_type')
->where('orty_id', $value->ord_new_type) ->where('orty_id', $value->ord_new_type)
->value('orty_name'); ->value('orty_name');
...@@ -1772,7 +1776,7 @@ class WashWorkService extends Service ...@@ -1772,7 +1776,7 @@ class WashWorkService extends Service
->orwhere('orcl_car_vehicle_type', 'like', '%' . $request['keywords'] . '%'); ->orwhere('orcl_car_vehicle_type', 'like', '%' . $request['keywords'] . '%');
} }
}) })
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_payment_way', 'ord_type', 'ord_order_state', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'ord_create_time', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_order_price', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_sales_adm_id', 'ord_is_split', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_car_brand_series', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'shop_store_name', 'ord_shop_id', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type', 'ord_new_type', 'ord_source') ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_payment_way', 'ord_type', 'ord_order_state', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'ord_create_time', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_order_price', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_sales_adm_id', 'ord_is_split', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_car_brand_series', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'shop_store_name', 'ord_shop_id', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type', 'ord_new_type', 'ord_source', 'orcl_buac_phone', 'orcl_buac_name', 'orcl_4sname')
->orderBy('ord_create_time', 'desc') ->orderBy('ord_create_time', 'desc')
->paginate($show_count); ->paginate($show_count);
$list_items = $list_data->items(); $list_items = $list_data->items();
...@@ -1849,8 +1853,10 @@ class WashWorkService extends Service ...@@ -1849,8 +1853,10 @@ class WashWorkService extends Service
->where('bucl_id', $value->ord_address_id) ->where('bucl_id', $value->ord_address_id)
->select('bucl_id', 'bucl_name', 'bucl_province', 'bucl_city', 'bucl_address', 'bucl_county') ->select('bucl_id', 'bucl_name', 'bucl_province', 'bucl_city', 'bucl_address', 'bucl_county')
->first(); ->first();
if ($find_address) {
$list_items[$key]->shop_store_name = $find_address->bucl_name; $list_items[$key]->shop_store_name = $find_address->bucl_name;
$list_items[$key]->ord_address = $find_address->bucl_province.$find_address->bucl_city.$find_address->bucl_county.$find_address->bucl_address; $list_items[$key]->ord_address = $find_address->bucl_province.$find_address->bucl_city.$find_address->bucl_county.$find_address->bucl_address;
}
} else { } else {
$find_address = DB::table('shop') $find_address = DB::table('shop')
->where('shop_id', $value->ord_shop_id) ->where('shop_id', $value->ord_shop_id)
...@@ -2982,7 +2988,7 @@ class WashWorkService extends Service ...@@ -2982,7 +2988,7 @@ class WashWorkService extends Service
->leftJoin('shop as s', 's.shop_id', '=', 'wo.wor_shop_id') ->leftJoin('shop as s', 's.shop_id', '=', 'wo.wor_shop_id')
->where('wor_id', $request['wor_id']) ->where('wor_id', $request['wor_id'])
->where('wor_shop_id', $user_info->adm_shop_id) ->where('wor_shop_id', $user_info->adm_shop_id)
->select('wor_id', 'wor_number', 'wor_create_id', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_service_quality', 'wocl_car_vin', 'shop_store_name', 'wor_service_state', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'orcl_sales_adm_id', 'wocl_car_brand_series', 'wocl_carowner_name', 'wocl_carowner_phone', 'wor_create_time', 'wor_new_goo_amount', 'wor_explain as wor_remark', 'wocl_bus_name', 'wor_address_type', 'wor_address_id', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_order_id', 'wor_work_type', 'wor_other_audit', 'ord_type', 'ord_address', 'orcl_cus_msg', 'ord_id', 'orcl_cus_msg','orcl_mileage', 'orcl_check_goods', 'orcl_check_goods', 'wor_order_number', 'wor_list_pic', 'ord_new_type','ord_state') ->select('wor_id', 'wor_number', 'wor_create_id', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_service_quality', 'wocl_car_vin', 'shop_store_name', 'wor_service_state', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'orcl_sales_adm_id', 'wocl_car_brand_series', 'wocl_carowner_name', 'wocl_carowner_phone', 'wor_create_time', 'wor_new_goo_amount', 'wor_explain as wor_remark', 'wocl_bus_name', 'wor_address_type', 'wor_address_id', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_order_id', 'wor_work_type', 'wor_other_audit', 'ord_type', 'ord_address', 'orcl_cus_msg', 'ord_id', 'orcl_cus_msg','orcl_mileage', 'orcl_check_goods', 'orcl_check_goods', 'wor_order_number', 'wor_list_pic', 'ord_new_type','ord_state', 'orcl_4sname', 'orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_name', 'orcl_phone', 'orcl_address', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_car_num', 'orcl_car_vin')
->first(); ->first();
if (empty($info)) { if (empty($info)) {
return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前工单不存在', 'data'=>'']; return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前工单不存在', 'data'=>''];
...@@ -3023,6 +3029,8 @@ class WashWorkService extends Service ...@@ -3023,6 +3029,8 @@ class WashWorkService extends Service
->whereIn('adm_id', $adm_id) ->whereIn('adm_id', $adm_id)
->pluck('adm_phone', 'adm_id') ->pluck('adm_phone', 'adm_id')
->toArray(); ->toArray();
$info->orcl_buac_name = $info->orcl_buac_name??'--';
$info->orcl_buac_phone = $info->orcl_buac_phone??'--';
$info->create_name = ''; $info->create_name = '';
if ($info->wor_create_id != '0' && isset($adm_name[$info->wor_create_id])) { if ($info->wor_create_id != '0' && isset($adm_name[$info->wor_create_id])) {
$info->create_name = $adm_name[$info->wor_create_id]; //创建人 $info->create_name = $adm_name[$info->wor_create_id]; //创建人
...@@ -3260,6 +3268,7 @@ class WashWorkService extends Service ...@@ -3260,6 +3268,7 @@ class WashWorkService extends Service
->where('ord_id', $info->wor_order_id) ->where('ord_id', $info->wor_order_id)
->orderBy('id', 'desc') ->orderBy('id', 'desc')
->get(); ->get();
// $order_client
$data['work_data'] = $info; $data['work_data'] = $info;
$data['find_order_cancel'] = $find_order_cancel?$find_order_cancel:[]; $data['find_order_cancel'] = $find_order_cancel?$find_order_cancel:[];
$data['goods_data'] = $goods_data; $data['goods_data'] = $goods_data;
...@@ -3491,7 +3500,7 @@ class WashWorkService extends Service ...@@ -3491,7 +3500,7 @@ class WashWorkService extends Service
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id') ->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->leftJoin('shop as c', 'ord.ord_shop_id', '=', 'c.shop_id') ->leftJoin('shop as c', 'ord.ord_shop_id', '=', 'c.shop_id')
->where('ord_id', $request['ord_id']) ->where('ord_id', $request['ord_id'])
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_create_time', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'shop_store_name', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_sales_adm_id', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type','ord_shop_id', 'ord_order_price', 'orcl_cus_msg', 'ord_new_type', 'ord_source', 'ord_add_type') ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_create_time', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'shop_store_name', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_sales_adm_id', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type','ord_shop_id', 'ord_order_price', 'orcl_cus_msg', 'ord_new_type', 'ord_source', 'ord_add_type', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname')
->first(); ->first();
if (empty($info)) { if (empty($info)) {
return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>'']; return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>''];
...@@ -4320,7 +4329,7 @@ class WashWorkService extends Service ...@@ -4320,7 +4329,7 @@ class WashWorkService extends Service
->leftJoin('order_client as orcl', 'orcl.orcl_ord_id', '=', 'w.wor_order_id') ->leftJoin('order_client as orcl', 'orcl.orcl_ord_id', '=', 'w.wor_order_id')
->where('wor_id', $request['wor_id']) ->where('wor_id', $request['wor_id'])
->where('wor_shop_id', $user_info->adm_shop_id) ->where('wor_shop_id', $user_info->adm_shop_id)
->select('wor_number', 'wor_order_id', 'wor_order_number', 'wocl_check_car_state', 'wocl_check_car_lock', 'wocl_phone', 'wocl_check_car_lockadmid', 'wocl_car_num', 'wor_work_type', 'wor_service_adm_id', 'orcl_mileage', 'orcl_car_brand_series', 'orcl_check_car_state', 'orcl_check_goods', 'wor_appoint_time', 'orcl_signature_img', 'orcl_check_car_app', 'orcl_is_submit', 'wor_ver_code', 'wor_need_return') ->select('wor_number', 'wor_order_id', 'wor_order_number', 'wocl_check_car_state', 'wocl_check_car_lock', 'wocl_phone', 'wocl_check_car_lockadmid', 'wocl_car_num', 'wor_work_type', 'wor_service_adm_id', 'orcl_mileage', 'orcl_car_brand_series', 'orcl_check_car_state', 'orcl_check_goods', 'wor_appoint_time', 'orcl_signature_img', 'orcl_check_car_app', 'orcl_is_submit', 'wor_ver_code', 'wor_need_return','orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname')
->first(); ->first();
if (empty($find_work)) { if (empty($find_work)) {
return ['code'=>1000, 'msg'=>'当前工单不存在', 'data'=>'']; return ['code'=>1000, 'msg'=>'当前工单不存在', 'data'=>''];
...@@ -6297,7 +6306,8 @@ class WashWorkService extends Service ...@@ -6297,7 +6306,8 @@ class WashWorkService extends Service
$list_button = getAppletListButton($request['api_token'], 40); $list_button = getAppletListButton($request['api_token'], 40);
$pri_id = array_column($list_button, 'pri_id'); $pri_id = array_column($list_button, 'pri_id');
if($adm_leave == 1 || in_array(79,$pri_id)){ if($adm_leave == 1 || in_array(79,$pri_id)){
$wor_count = DB::table('work_order'); $wor_count = DB::table('work_order')
->leftJoin('wash_work_technician_part as c', 'c.wotp_wor_id', '=', 'wor_id');
}else{ }else{
$wor_count = DB::table('wash_work_technician_part as a') $wor_count = DB::table('wash_work_technician_part as a')
->leftJoin('work_order as b', 'b.wor_id', '=', 'a.wotp_wor_id') ->leftJoin('work_order as b', 'b.wor_id', '=', 'a.wotp_wor_id')
......
app/Services/Operation/BusinessService.php
浏览文件 @ e25f7f85
...@@ -67,7 +67,8 @@ class BusinessService extends Service ...@@ -67,7 +67,8 @@ class BusinessService extends Service
}) })
->where(function ($query) use ($search_data) { ->where(function ($query) use ($search_data) {
if (!empty($search_data['bucl_user_phone'])) { if (!empty($search_data['bucl_user_phone'])) {
$query->where('bucl_user_phone', 'like', '%' . $search_data['bucl_user_phone'] . '%'); $query->where('bucl_user_phone', 'like', '%' . $search_data['bucl_user_phone'] . '%')
->orwhere('buac_phone', 'like', '%' . $search_data['bucl_user_phone'] . '%');
} }
}) })
->where(function ($query) use ($search_data) { ->where(function ($query) use ($search_data) {
......
app/Services/WeChatApplet/Technician/MemberService.php
浏览文件 @ e25f7f85
...@@ -131,20 +131,26 @@ class MemberService extends Service ...@@ -131,20 +131,26 @@ class MemberService extends Service
{ {
// 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id // 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id
$shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id; $shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id;
if ($request['mem_car_num']) { // if ($request['mem_car_num']) {
// 判断车牌号是否存在 // // 判断车牌号是否存在
$find_meca = DB::table('member') // $find_meca = DB::table('member')
->where('mem_id', '<>', $request['mem_id']) // ->where('mem_id', '<>', $request['mem_id'])
->where('mem_shop_id', $user_info->adm_shop_id) // ->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_car_num', $request['mem_car_num']) // ->where('mem_car_num', $request['mem_car_num'])
->first(['mem_id']); // ->first(['mem_id']);
if ($find_meca) { // if ($find_meca) {
return ['code' => 500, 'msg' => '当前车牌号已存在', 'data' => '当前车牌号已存在']; // return ['code' => 500, 'msg' => '当前车牌号已存在', 'data' => '当前车牌号已存在'];
} // }
} // }
// 2 编辑一个手机号与车牌号的绑定关系 // 2 编辑一个手机号与车牌号的绑定关系
$mem_edit_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']); //车牌号 $mem_edit_data['mem_name'] = $request['mem_name']; //4s联系人
$mem_edit_data['mem_4sname'] = $request['mem_4sname']; //4s店名称
$mem_edit_data['mem_phone'] = $request['mem_phone']; //手机号
// $mem_edit_data['mem_province'] = $request['mem_province']; //省
// $mem_edit_data['mem_city'] = $request['mem_city']; //市
// $mem_edit_data['mem_county'] = $request['mem_county']; //县
// $mem_edit_data['mem_address'] = $request['mem_address']; //详细地址
$mem_edit_data['mem_update_time'] = date('Y-m-d H:i:s'); $mem_edit_data['mem_update_time'] = date('Y-m-d H:i:s');
DB::beginTransaction(); //开启回滚事物 DB::beginTransaction(); //开启回滚事物
...@@ -153,28 +159,28 @@ class MemberService extends Service ...@@ -153,28 +159,28 @@ class MemberService extends Service
->where('mem_id', $request['mem_id']) ->where('mem_id', $request['mem_id'])
->update($mem_edit_data); ->update($mem_edit_data);
// 3.新增一个车辆信息 // 3.新增一个车辆信息
if ($request['mem_car_num']) { // if ($request['mem_car_num']) {
$meca_add_data['meca_cid'] = $user_info->adm_cid; // $meca_add_data['meca_cid'] = $user_info->adm_cid;
$meca_add_data['meca_shop_id'] = $user_info->adm_shop_id; // $meca_add_data['meca_shop_id'] = $user_info->adm_shop_id;
$meca_add_data['meca_superior_shop_id'] = $shop_id; // $meca_add_data['meca_superior_shop_id'] = $shop_id;
$meca_add_data['meca_create_adm_id'] = $user_info->adm_id; // $meca_add_data['meca_create_adm_id'] = $user_info->adm_id;
$meca_add_data['meca_mem_id'] = $request['mem_id']; // $meca_add_data['meca_mem_id'] = $request['mem_id'];
$meca_add_data['meca_car_num'] = $request['mem_car_num']; // $meca_add_data['meca_car_num'] = $request['mem_car_num'];
$meca_id = DB::table('member_car') // $meca_id = DB::table('member_car')
->where('meca_mem_id', $request['mem_id']) // ->where('meca_mem_id', $request['mem_id'])
->value('meca_id'); // ->value('meca_id');
if ($meca_id) { // if ($meca_id) {
$meca_add_data['meca_update_time'] = date('Y-m-d H:i:s'); // $meca_add_data['meca_update_time'] = date('Y-m-d H:i:s');
$meca_res = DB::table('member_car') // $meca_res = DB::table('member_car')
->where('meca_id', $meca_id) // ->where('meca_id', $meca_id)
->update($meca_add_data); // ->update($meca_add_data);
} else { // } else {
$meca_res = DB::table('member_car')->insert($meca_add_data); // $meca_res = DB::table('member_car')->insert($meca_add_data);
} // }
} else { // } else {
$meca_res = true; // $meca_res = true;
} // }
if ($mem_res && $meca_res) { if ($mem_res) {
DB::commit(); DB::commit();
// Common::addLog($user_info, $request->getClientIp(), '会员列表', '编辑', '编辑会员：' . $request['mem_phone'] . '成功'); // Common::addLog($user_info, $request->getClientIp(), '会员列表', '编辑', '编辑会员：' . $request['mem_phone'] . '成功');
return ["code" => 200, 'msg' => '编辑会员车牌号成功', 'data' => '']; return ["code" => 200, 'msg' => '编辑会员车牌号成功', 'data' => ''];
...@@ -261,7 +267,7 @@ class MemberService extends Service ...@@ -261,7 +267,7 @@ class MemberService extends Service
if (isset($request['mem_id']) && !empty($request['mem_id'])) { if (isset($request['mem_id']) && !empty($request['mem_id'])) {
$list_data = DB::table('member') $list_data = DB::table('member')
->where('mem_id', $request['mem_id']) ->where('mem_id', $request['mem_id'])
->select('mem_name', 'mem_id', 'mem_phone', 'mem_car_num', 'mem_car_series', 'mem_car_color', 'mem_source', 'mem_sex','mem_fid') ->select('mem_name', 'mem_id', 'mem_phone', 'mem_car_num', 'mem_car_series', 'mem_car_color', 'mem_source', 'mem_sex','mem_fid', 'mem_4sname')
->first(); ->first();
if ($list_data) { if ($list_data) {
if($list_data->mem_car_num=='') { if($list_data->mem_car_num=='') {
...@@ -302,7 +308,7 @@ class MemberService extends Service ...@@ -302,7 +308,7 @@ class MemberService extends Service
->first(); ->first();
$work_order = CommonService::dataToArray($work_order); $work_order = CommonService::dataToArray($work_order);
if($work_order && $work_order['wor_state']>5){ if($work_order && $work_order['wor_state']>5){
return ['code' => 500, 'msg' => '工单已验车', 'data' => '工单已验车']; return ['code' => 500, 'msg' => '工单已验件', 'data' => '工单已验件'];
} }
// 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id // 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id
$shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id; $shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id;
...@@ -318,41 +324,21 @@ class MemberService extends Service ...@@ -318,41 +324,21 @@ class MemberService extends Service
} }
} }
$mem_add_data['mem_name'] = $request['mem_name']; $mem_add_data['mem_name'] = $request['mem_name'];
$mem_add_data['mem_sex'] = $request['mem_sex']; $mem_add_data['mem_4sname'] = $request['mem_4sname'];
$mem_add_data['mem_fid'] = $mem_fid;
$mem_add_data['mem_phone'] = $request['mem_phone']; $mem_add_data['mem_phone'] = $request['mem_phone'];
$mem_add_data['mem_birthday'] = $request['mem_birthday'] ?? '';
$mem_add_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']);
$mem_add_data['mem_car_series'] = $request['mem_car_series'] ?? '';
$mem_add_data['mem_car_color'] = $request['mem_car_color'] ?? '';
$mem_add_data['mem_car_model'] = $request['mem_car_model'] ?? '';
// $mem_add_data['mem_province'] = $request['mem_province'] ?? '';
// $mem_add_data['mem_city'] = $request['mem_city'] ?? '';
// $mem_add_data['mem_county'] = $request['mem_county'] ?? '';
// $mem_add_data['mem_address'] = $request['mem_address'] ?? '';
$mem_add_data['mem_bership'] = $request['mem_bership']??1;
$mem_add_data['mem_source'] = $request['mem_source'] ?? '';
$mem_add_data['mem_update_time'] = date("Y-m-d H:i:s");
//订单用户信息 //订单用户信息
$order_client['orcl_name'] = $mem_add_data['mem_name']; $order_client['orcl_name'] = $mem_add_data['mem_name'];
$order_client['orcl_phone'] = $mem_add_data['mem_phone']; $order_client['orcl_phone'] = $mem_add_data['mem_phone'];
$order_client['orcl_carowner_name'] = $mem_add_data['mem_name']; $order_client['orcl_4sname'] = $mem_add_data['mem_4sname'];
$order_client['orcl_carowner_phone'] = $mem_add_data['mem_phone']; $order_client['orcl_carowner_phone'] = $mem_add_data['mem_phone'];
$order_client['orcl_car_num'] = $mem_add_data['mem_car_num'];
$order_client['orcl_car_vehicle_type'] = $mem_add_data['mem_car_series'];
$order_client['orcl_car_brand_series'] = $mem_add_data['mem_car_series'];
$order_client['orcl_update_time'] = date("Y-m-d H:i:s"); $order_client['orcl_update_time'] = date("Y-m-d H:i:s");
//工单用户信息 //工单用户信息
$work_client['wocl_name'] = $mem_add_data['mem_name']; $work_client['wocl_name'] = $mem_add_data['mem_name'];
$work_client['wocl_phone'] = $mem_add_data['mem_phone']; $work_client['wocl_phone'] = $mem_add_data['mem_phone'];
$work_client['wocl_carowner_name'] = $mem_add_data['mem_name']; $work_client['wocl_carowner_name'] = $mem_add_data['mem_name'];
$work_client['wocl_carowner_phone'] = $mem_add_data['mem_phone']; $work_client['wocl_carowner_phone'] = $mem_add_data['mem_phone'];
$work_client['wocl_car_num'] = $mem_add_data['mem_car_num'];
$work_client['wocl_car_vehicle_type'] = $mem_add_data['mem_car_series'];
$work_client['wocl_car_brand_series'] = $mem_add_data['mem_car_series'];
$work_client['wocl_update_time'] = date("Y-m-d H:i:s"); $work_client['wocl_update_time'] = date("Y-m-d H:i:s");
if ($request['add_type'] == 1) { if ($request['add_type'] == 1) {
// if($work_order && $work_order['wor_state']>5){
$find_mem = DB::table('member') $find_mem = DB::table('member')
->where('mem_cid', $user_info->adm_cid) ->where('mem_cid', $user_info->adm_cid)
->where('mem_shop_id', $user_info->adm_shop_id) ->where('mem_shop_id', $user_info->adm_shop_id)
...@@ -397,11 +383,14 @@ class MemberService extends Service ...@@ -397,11 +383,14 @@ class MemberService extends Service
->where('mem_cid', $user_info->adm_cid) ->where('mem_cid', $user_info->adm_cid)
->where('mem_shop_id', $user_info->adm_shop_id) ->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_phone', $request['mem_phone']) ->where('mem_phone', $request['mem_phone'])
->where('mem_id', $request['mem_id'])
->value('mem_id'); ->value('mem_id');
if ($find_mem) { if ($find_mem) {
$order_client['orcl_client_id'] = $find_mem; $order_client['orcl_client_id'] = $find_mem;
$work_client['wocl_client_id'] = $find_mem; $work_client['wocl_client_id'] = $find_mem;
if(isset($request['phone_type']) && $request['phone_type']==2){ if(isset($request['phone_type']) && $request['phone_type']==2){
$mem_res = DB::table('member') $mem_res = DB::table('member')
->where('mem_id', $find_mem) ->where('mem_id', $find_mem)
->update($mem_add_data); ->update($mem_add_data);
...@@ -435,29 +424,8 @@ class MemberService extends Service ...@@ -435,29 +424,8 @@ class MemberService extends Service
DB::rollback(); DB::rollback();
return ["code" => 500, 'msg' => '编辑用户信息失败'.$add_order_client.'-'.$add_work_client, 'data' => '']; return ["code" => 500, 'msg' => '编辑用户信息失败'.$add_order_client.'-'.$add_work_client, 'data' => ''];
} }
if ($request['mem_car_num']) {
// 判断车牌号是否存在 mem_car_num if ($mem_res) {
$meca_add_data['meca_cid'] = $user_info->adm_cid;
$meca_add_data['meca_shop_id'] = $user_info->adm_shop_id;
$meca_add_data['meca_superior_shop_id'] = $shop_id;
$meca_add_data['meca_create_adm_id'] = $user_info->adm_id;
$meca_add_data['meca_mem_id'] = $request['mem_id'];
$meca_add_data['meca_car_num'] = $request['mem_car_num'];
$meca_add_data['meca_car_brand_series'] = $request['mem_car_series'] ?? '';
$meca_add_data['meca_update_time'] = date('Y-m-d H:i:s');
$meca_id = DB::table('member_car')
->where('meca_mem_id', $request['mem_id'])
->where('meca_car_num', $request['mem_car_num'])
->value('meca_id');
if ($meca_id) {
$meca_res = DB::table('member_car')
->where('meca_id', $meca_id)
->update($meca_add_data);
} else {
$meca_res = DB::table('member_car')->insert($meca_add_data);
}
}
if ($mem_res && $meca_res) {
DB::commit(); DB::commit();
if ($request['add_tyoe'] == 1) { if ($request['add_tyoe'] == 1) {
$ontent = '订单编辑会员信息-添加新会员'; $ontent = '订单编辑会员信息-添加新会员';
...@@ -592,4 +560,151 @@ class MemberService extends Service ...@@ -592,4 +560,151 @@ class MemberService extends Service
public static function getSetType ( ){ public static function getSetType ( ){
return ['sourceSet'=>'来源设置']; return ['sourceSet'=>'来源设置'];
} }
public static function editOrderBus ( $user_info , $request , $ip = '' ){
if(!isset($request['edit_type']) || !in_array($request['edit_type'], [1,2])){
return ['code' => 500, 'msg' => '操作类型错误', 'data' => '操作类型错误'];
}
if(!isset($request['order_number']) || empty($request['order_number'])){
return ['code' => 500, 'msg' => '单号信息错误', 'data' => '单号信息错误'];
}
if ($request['edit_type'] == 1) {
if (isset($request['buac_id']) && !empty($request['buac_id'])) {
$list_data = DB::table('business_account')
->leftJoin('business_client', 'bucl_id', '=', 'buac_bucl_id')
->where('buac_id', $request['buac_id'])
->select('buac_bucl_id', 'bucl_name', 'buac_name', 'buac_phone', 'buac_id')
->first();
if ($list_data) {
return ['code' => 200, 'msg' => 'success', 'data' => $list_data];
} else {
return ['code' => 500, 'msg' => '查无数据', 'data' => '查无数据'];
}
} else {
return ['code' => 500, 'msg' => '请选择会员', 'data' => '请选择会员'];
}
}else {
$order = DB::table('order')
->where('ord_order_number',$request['order_number'])
->select('ord_state','ord_id')
->first();
$order = CommonService::dataToArray($order);
if(!$order){
return ['code' => 500, 'msg' => '单号不存在', 'data' => '单号不存在'];
}
if($order['ord_state']!=1){
return ['code' => 500, 'msg' => '订单已结算', 'data' => '订单已结算'];
}
$work_order = DB::table('work_order')
->where('wor_order_id',$order['ord_id'])
->select('wor_state','wor_id')
->first();
$work_order = CommonService::dataToArray($work_order);
if($work_order && $work_order['wor_state']>5){
return ['code' => 500, 'msg' => '工单已验件', 'data' => '工单已验件'];
}
// 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id
$shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id;
DB::beginTransaction(); //开启回滚事物
$mem_add_data['buac_name'] = $request['buac_name'];
$mem_add_data['buac_phone'] = $request['buac_phone'];
$mem_add_data['buac_bucl_id'] = $request['buac_bucl_id'];
//订单用户信息
$order_client['orcl_business_id'] = $request['buac_bucl_id'];
$bucl_name = DB::table('business_client')
->where('bucl_id', $request['buac_bucl_id'])
->value('bucl_name');
$order_client['orcl_business_name'] = $bucl_name;
$order_client['orcl_buac_name'] = $mem_add_data['buac_name'];
$order_client['orcl_buac_phone'] = $mem_add_data['buac_phone'];
$order_client['orcl_update_time'] = date("Y-m-d H:i:s");
//工单用户信息
$work_client['wocl_business_id'] = $request['buac_bucl_id'];
$work_client['wocl_business_name'] = $request['bucl_name'];
$work_client['wocl_update_time'] = date("Y-m-d H:i:s");
if ($request['add_type'] == 1) {
$find_mem = DB::table('business_account')
->where('buac_cid', $user_info->adm_cid)
->where('buac_shop_id', $user_info->adm_shop_id)
->where('buac_bucl_id', $request['buac_bucl_id'])
->where('buac_phone', $request['buac_phone'])
->value('buac_id');
if ($find_mem) {
$order_client['orcl_buac_id'] = $find_mem;
if(isset($request['phone_type']) && $request['phone_type']==2){
$mem_res = DB::table('business_account')
->where('buac', $find_mem)
->update($mem_add_data);
$request['buac_id'] = $find_mem;
}else {
DB::rollback();
return ["code" => 10086, 'msg' => '当前手机号已存在,是否直接使用', 'data' => '当前手机号已存在,是否直接使用'];
}
}else {
$mem_add_data['buac_cid'] = $user_info->adm_cid;
$mem_add_data['buac_shop_id'] = $user_info->adm_shop_id;
// $mem_add_data['buac_create_name'] = $user_info->adm_name;
$mem_add_data['buac_create_adm_id'] = $user_info->adm_id;
$mem_add_data['buac_create_time'] = date('Y-m-d H:i:s');
$mem_id = DB::table('business_account')->insertGetId($mem_add_data);
$order_client['orcl_buac_id'] = $mem_id;
if ($mem_id) {
$mem_res = true;
$request['buac_id'] = $mem_res;
} else {
DB::rollback();
return ["code" => 500, 'msg' => '添加会员信息失败', 'data' => ''];
}
}
} else {
if (!isset($request['buac_id']) || empty($request['buac_id'])) {
DB::rollback();
return ["code" => 500, 'msg' => '未选择对应会员', 'data' => ''];
}else {
$find_mem = DB::table('business_account')
->where('buac_cid', $user_info->adm_cid)
->where('buac_shop_id', $user_info->adm_shop_id)
->where('buac_phone', $request['buac_phone'])
->value('buac_id');
if ($find_mem) {
$order_client['orcl_buac_id'] = $find_mem;
if(isset($request['phone_type']) && $request['phone_type']==2){
$mem_res = DB::table('business_account')
->where('buac_id', $find_mem)
->update($mem_add_data);
$request['buac_id'] = $find_mem;
}else {
DB::rollback();
return ["code" => 10086, 'msg' => '当前手机号已存在,是否直接使用', 'data' => '当前手机号已存在,是否直接使用'];
}
}else {
$mem_res = DB::table('business_account')
->where('buac_id', $request['buac_id'])
->update($mem_add_data);
}
}
}
$add_order_client = DB::table('order_client')->where('orcl_ord_id',$order['ord_id'])->update($order_client);
if(!$add_order_client){
DB::rollback();
return ["code" => 500, 'msg' => '编辑用户信息失败'.$add_order_client.'-'.$add_work_client, 'data' => ''];
}
if ($mem_res) {
DB::commit();
if ($request['add_tyoe'] == 1) {
$ontent = '订单编辑保险公司信息-添加新定损员';
} else {
$ontent = '订单编辑会员信息-编辑原有定损员';
}
OperationLog::addLog($user_info, $ip, '会员管理', '编辑定损员信息', $ontent);
return ["code" => 200, 'msg' => '操作成功', 'data' => ''];
} else {
DB::rollback();
return ["code" => 500, 'msg' => '操作失败', 'data' => ''];
}
}
}
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论