Skip to content

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

维修项目修改

上级 3b11caaa
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 59 行删除
app/Http/Controllers/Api/MemberManage/MemberListController.php
浏览文件 @ e25f7f85
......@@ -136,7 +136,7 @@ class MemberListController extends Controller
// }
//按钮
if ($value->mem_state == 1) {
$buttonData = ['info','setCare','edit','sendRecord','recharge', 'stop'];
$buttonData = ['info','edit', 'stop'];
}
if ($value->mem_state == 2) {
$buttonData[] = 'start';
......@@ -239,31 +239,32 @@ class MemberListController extends Controller
->where('mem_cid', $user_info->adm_cid)
->where('mem_superior_shop_id', $shop_id)
->where('mem_phone', $request['mem_phone'])
->where('mem_4sname', $request['mem_4sname'])
->first(['mem_id']);
if ($find_mem) {
return response()->json(['code' => 500, 'msg' => '当前手机号已存在', 'data' => '当前手机号已存在']);
}
if ($request['mem_car_num']) {
// 判断车牌号是否存在
$find_meca = DB::table('member_car')
->where('meca_cid', $user_info->adm_cid)
->where('meca_superior_shop_id', $shop_id)
->where('meca_car_num', $request['mem_car_num'])
->first(['meca_id']);
if ($find_meca) {
return response()->json(['code' => 500, 'msg' => '当前车牌号已存在', 'data' => '当前车牌号已存在']);
}
}
$mem_fid = 0;
if ($request['mem_fphone']) {
$mem_fid = DB::table('member')
->where('mem_shop_id', $shop_id)
->where('mem_phone', $request['mem_fphone'])
->value('mem_id');
if (!$mem_fid) {
return response()->json(['code' => 500, 'msg' => '未查询到该推荐人', 'data' => '']);
}
}
// if ($request['mem_car_num']) {
// // 判断车牌号是否存在
// $find_meca = DB::table('member_car')
// ->where('meca_cid', $user_info->adm_cid)
// ->where('meca_superior_shop_id', $shop_id)
// ->where('meca_car_num', $request['mem_car_num'])
// ->first(['meca_id']);
// if ($find_meca) {
// return response()->json(['code' => 500, 'msg' => '当前车牌号已存在', 'data' => '当前车牌号已存在']);
// }
// }
// $mem_fid = 0;
// if ($request['mem_fphone']) {
// $mem_fid = DB::table('member')
// ->where('mem_shop_id', $shop_id)
// ->where('mem_phone', $request['mem_fphone'])
// ->value('mem_id');
// if (!$mem_fid) {
// return response()->json(['code' => 500, 'msg' => '未查询到该推荐人', 'data' => '']);
// }
// }
DB::beginTransaction();
// 2 新增一个会员信息
......@@ -275,7 +276,7 @@ class MemberListController extends Controller
$mem_add_data['mem_create_name'] = $user_info->adm_name;
$mem_add_data['mem_create_id'] = $user_info->adm_id;
// $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_birthday'] = $request['mem_birthday'] ? $request['mem_birthday'] : '';
$mem_add_data['mem_car_num'] = str_replace(' ', '', $request['mem_car_num']);
......@@ -1542,4 +1543,25 @@ class MemberListController extends Controller
$user_info = Common::getUserInfo($request['api_token']);
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
->where('mem_state', 1)
->where(function ($query) use ($search_data) {
if (!empty($search_data['search_data'])) {
$query->where('mem_name', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('mem_car_num', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('mem_phone', 'like', '%' . $search_data['search_data'] . '%');
$query->where('mem_name', $search_data['search_data'])
->orwhere('mem_phone', $search_data['search_data']);
}
})
->where(function ($query) use ($search_data) {
......@@ -3634,8 +3633,8 @@ class CashierDeskController extends Controller
->where('buac_state', 1)
->where(function ($query) use ($search_data) {
if (!empty($search_data['search_data'])) {
$query->where('buac_name', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('buac_phone', 'like', '%' . $search_data['search_data'] . '%');
$query->where('buac_name', $search_data['search_data'])
->orwhere('buac_phone', $search_data['search_data']);
}
})
->where(function ($query) use ($search_data) {
......
app/Http/Controllers/Mounting/Business/WashOrderController.php
浏览文件 @ e25f7f85
......@@ -78,7 +78,7 @@ class WashOrderController extends Controller
// 获取当前列表下的按钮
$list_button = getListButton($request['api_token'], $request['pri_id']);
//获取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);
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
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
$exist = BusinessService::phoneExists($user_info, $request->all(), 0);
if ($exist == 1) {
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());
if ($res) {
DB::commit();
......
app/Http/Controllers/WeChatApplet/Technician/MemberController.php
浏览文件 @ e25f7f85
......@@ -33,7 +33,7 @@ class MemberController extends Controller
if (isset($request['mem_id']) && !empty($request['mem_id'])) {
$list_data = DB::table('member')
->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();
if ($list_data) {
$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
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]);
} 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
->leftJoin('weixin_user as wx', 'ussh.ussh_weus_id', '=', 'wx.weus_id')
->leftJoin('member_car as mc', 'mc.meca_mem_id', '=', 'm.mem_id')
->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');
if(empty($search_data['page'])){
$list = $list_data
......@@ -777,7 +777,6 @@ class WashOrderController extends Controller
}else {
$list[$key]->firstLetter = $value->mem_initial;
}
//
//折扣
$list[$key]->discount = '';
if(isset($meml_discount[$value->mem_level])){
......
app/Http/Controllers/WeChatApplet/Technician/WashWorkController.php
浏览文件 @ e25f7f85
......@@ -393,9 +393,9 @@ class WashWorkController extends Controller
}
}
if(in_array($value->ord_wor_state, [1])){
if($value->ord_type!=3) {
$buttonData[] = 'setService';
}
// if($value->ord_type!=3) {
// $buttonData[] = 'setService';
// }
$buttonData[] = 'newCreateWork';
}
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
$validator = Validator::make($data, [
'mem_name' => 'required|max:80',
'mem_phone' => 'required',
'mem_car_num' => 'required',
// 'mem_car_num' => 'required',
// 'mem_car_series' => 'required',
], $messages);
......@@ -1003,7 +1003,7 @@ class WashOrderValidator extends FormRequest
$validator = Validator::make($data, [
'buac_name' => 'required|max:80',
'buac_phone' => 'required',
'buac_password' => 'required',
// 'buac_password' => 'required',
'buac_bucl_id' => 'required',
], $messages);
......
app/Http/Requests/Validators/WeChatApplet/Technician/MemberValidator.php
浏览文件 @ e25f7f85
......@@ -35,7 +35,7 @@ class MemberValidator extends FormRequest
$validator = Validator::make($data, [
'type' => 'required',
'mem_id' => 'required|integer|min:1',
'mem_car_num' => 'required|max:10',
// 'mem_car_num' => 'required|max:10',
], $messages);
// 判断数据验证是否成功
......
app/Services/Business/WashOrderBasicService.php
浏览文件 @ e25f7f85
......@@ -157,25 +157,25 @@ class WashOrderBasicService extends Service
$data['ord_create_id'] = $user_info->adm_id;
$data['ord_client_id'] = isset($request['ord_client_id']) ? $request['ord_client_id'] : 0;
$data['ord_ware_id'] = $request['ware_id'] ? $request['ware_id'] : '';
if ($request['ord_address_type'] == 1) { //本店
$ord_address = DB::table('shop')
->where('shop_id', $request['ord_address_id'])
->value('shop_store_name');
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')
->where('bucl_id', $request['ord_address_id'])
->value('bucl_name');
if ($request['ord_address'] != $ord_address) {
return ['code' => ErrorInc::REQUEST_INAPTNESS, 'msg' => '施工门店错误', 'data' => ''];
}
} elseif ($request['ord_address_type'] == 3) { //分店
$ord_address = DB::table('shop')
->where('shop_id', $request['ord_address_id'])
->value('shop_store_name');
}
// if ($request['ord_address_type'] == 1) { //本店
// 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')
// ->where('bucl_id', $request['ord_address_id'])
// ->value('bucl_name');
// if ($request['ord_address'] != $ord_address) {
// return ['code' => ErrorInc::REQUEST_INAPTNESS, 'msg' => '施工门店错误', 'data' => ''];
// }
// } elseif ($request['ord_address_type'] == 3) { //分店
// $ord_address = DB::table('shop')
// ->where('shop_id', $request['ord_address_id'])
// ->value('shop_store_name');
// }
$request['ord_type'] = isset($request['ord_type']) ? $request['ord_type'] : 0;
$data['ord_other_system_number'] = $request['ord_other_system_number']??'';
$data['ord_address'] = $request['ord_address'];
......@@ -1592,7 +1592,7 @@ class WashOrderBasicService extends Service
}
//企业信息
$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 = [
'recpay_type'=>1,//类型：1销售订单2充值卡
'recpay_original_id'=>$ord_id,//订单id
......
app/Services/Operation/BusinessService.php
浏览文件 @ e25f7f85
......@@ -67,7 +67,8 @@ class BusinessService extends Service
})
->where(function ($query) use ($search_data) {
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) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论