Skip to content

Y
yhwx
提交 3b11caaa authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

Merge branch 'master' of http://gitlab.bluearp.com/ldj/yhwx

上级 81fe0fe0 823cf623
隐藏空白字符变更
内嵌 并排
正在显示 包含 1116 行增加 和 763 行删除
app/ExcelTemp/ExcelTemp.php
浏览文件 @ 3b11caaa
......@@ -7,18 +7,18 @@ trait ExcelTemp
{
$action = [
['action_name' => '订单列表', 'action_value' => 'WashOrderindex'],//订单管理
['action_name' => '采购管理', 'action_value' => 'PurchaseOrderindex'],//采购管理
['action_name' => '调拨单', 'action_value' => 'TransferringOrdersindex'],//调拨单
// ['action_name' => '采购管理', 'action_value' => 'PurchaseOrderindex'],//采购管理
// ['action_name' => '调拨单', 'action_value' => 'TransferringOrdersindex'],//调拨单
['action_name' => '绩效明细-工单', 'action_value' => 'OrderPerformance'],//工单绩效管理
['action_name' => '绩效明细-技师', 'action_value' => 'TechnicianPerformance'],//技师绩效管理
['action_name' => '绩效明细-详情', 'action_value' => 'DetailPerformance'],//详情绩效管理
['action_name' => '应收应付', 'action_value' => 'receivablePayindex'],//应收应付
['action_name' => '商品列表', 'action_value' => 'GoodsListindex'],//商品
// ['action_name' => '商品列表', 'action_value' => 'GoodsListindex'],//商品
['action_name' => '会员客户', 'action_value' => 'MemberListindex'],//会员客户
['action_name' => '销售员绩效', 'action_value' => 'ProPerformanceordersp'],//销售员绩效
// ['action_name' => '销售员绩效', 'action_value' => 'ProPerformanceordersp'],//销售员绩效
['action_name' => '工单列表', 'action_value' => 'WashWork'],//工单列表
['action_name' => '售后列表', 'action_value' => 'WashAfterSales'],//售后列表
['action_name' => '罚单列表', 'action_value' => 'WashViolation'],//罚单列表
// ['action_name' => '售后列表', 'action_value' => 'WashAfterSales'],//售后列表
// ['action_name' => '罚单列表', 'action_value' => 'WashViolation'],//罚单列表
];
return $action;
}
......@@ -29,30 +29,30 @@ trait ExcelTemp
'WashOrderindex' => [//订单管理
['field_name' => '订单单号', 'field_value' => 'ord_order_number'],
['field_name' => '订单状态', 'field_value' => 'ord_wor_state'],
['field_name' => '订单来源', 'field_value' => 'ord_source'],
['field_name' => '商品名称', 'field_value' => 'orgo_goo_name'],
['field_name' => '商品单位', 'field_value' => 'orgo_goo_unit'],
['field_name' => '商品数量', 'field_value' => 'orgo_goo_quantity'],
['field_name' => '检索编码', 'field_value' => 'orgo_goo_goods_encode'],
['field_name' => '仓库', 'field_value' => 'ord_ware_id'],
['field_name' => '订单总额(元)', 'field_value' => 'ord_order_price'],
['field_name' => '实付金额(元)', 'field_value' => 'ord_actual_price'],
['field_name' => '结算状态', 'field_value' => 'ord_state'],
['field_name' => '结算方式', 'field_value' => 'ord_payment_way'],
['field_name' => '结算时间', 'field_value' => 'ord_settlement_time'],
['field_name' => '会员姓名', 'field_value' => 'orcl_name'],
['field_name' => '会员电话', 'field_value' => 'orcl_phone'],
['field_name' => '下单金额', 'field_value' => 'ord_order_price'],
['field_name' => '订单金额', 'field_value' => 'ord_actual_price'],
['field_name' => '保险公司', 'field_value' => 'orcl_business_name'],
['field_name' => '定损员姓名', 'field_value' => 'orcl_buac_name'],
['field_name' => '定损员电话', 'field_value' => 'orcl_buac_phone'],
['field_name' => '4S店名称', 'field_value' => 'orcl_4sname'],
['field_name' => '4S店联系人', 'field_value' => 'orcl_name'],
['field_name' => '4S店联系电话', 'field_value' => 'orcl_phone'],
['field_name' => '车牌号', 'field_value' => 'orcl_car_num'],
['field_name' => '品牌车系', 'field_value' => 'orcl_car_brand_series'],
['field_name' => '客户类型', 'field_value' => 'ord_type'],//
['field_name' => '客户来源', 'field_value' => 'orcl_mem_source'], //
['field_name' => '车主姓名', 'field_value' => 'orcl_carowner_name'],//
['field_name' => '车主电话', 'field_value' => 'orcl_carowner_phone'],//
['field_name' => '销售人', 'field_value' => 'orcl_sales_adm_id'],//
['field_name' => '录单人', 'field_value' => 'ord_create_id'],//
['field_name' => '预约时间', 'field_value' => 'orcl_appoint_time'],//
['field_name' => '创建时间', 'field_value' => 'ord_create_time'],//
['field_name' => '施工门店', 'field_value' => 'ord_shop_id'],//
['field_name' => '创建时间', 'field_value' => 'ord_create_time'],
['field_name' => '开票状态', 'field_value' => 'ord_openbill'],
// ['field_name' => '会员姓名', 'field_value' => 'orcl_name'],
// ['field_name' => '会员电话', 'field_value' => 'orcl_phone'],
// ['field_name' => '车牌号', 'field_value' => 'orcl_car_num'],
// ['field_name' => '品牌车系', 'field_value' => 'orcl_car_brand_series'],
// ['field_name' => '客户类型', 'field_value' => 'ord_type'],//
// ['field_name' => '客户来源', 'field_value' => 'orcl_mem_source'], //
// ['field_name' => '车主姓名', 'field_value' => 'orcl_carowner_name'],//
// ['field_name' => '车主电话', 'field_value' => 'orcl_carowner_phone'],//
// ['field_name' => '销售人', 'field_value' => 'orcl_sales_adm_id'],//
// ['field_name' => '录单人', 'field_value' => 'ord_create_id'],//
// ['field_name' => '预约时间', 'field_value' => 'orcl_appoint_time'],//
// ['field_name' => '创建时间', 'field_value' => 'ord_create_time'],//
// ['field_name' => '施工门店', 'field_value' => 'ord_shop_id'],//
],
/*'PurchaseOrderindex' => [//采购管理
......@@ -196,21 +196,22 @@ trait ExcelTemp
],
'MemberListindex' => [//会员客户
['field_name' => '会员姓名', 'field_value' => 'mem_name'],
['field_name' => '性别', 'field_value' => 'mem_sex'],
['field_name' => '联系电话', 'field_value' => 'mem_phone'],
['field_name' => '4S店名称', 'field_value' => 'mem_4sname'],
['field_name' => '4S店联系人', 'field_value' => 'mem_name'],
// ['field_name' => '性别', 'field_value' => 'mem_sex'],
['field_name' => '4S店联系电话', 'field_value' => 'mem_phone'],
['field_name' => '联系地址', 'field_value' => 'mem_address'],
['field_name' => '车牌号', 'field_value' => 'mem_car_num'],
['field_name' => '品牌车系', 'field_value' => 'mem_car_series'],
['field_name' => '会员级别', 'field_value' => 'mem_bership'],
['field_name' => '会员等级', 'field_value' => 'mem_level'],
['field_name' => '生日', 'field_value' => 'mem_birthday'],
['field_name' => '来源', 'field_value' => 'mem_source'],
// ['field_name' => '车牌号', 'field_value' => 'mem_car_num'],
// ['field_name' => '品牌车系', 'field_value' => 'mem_car_series'],
// ['field_name' => '会员级别', 'field_value' => 'mem_bership'],
// ['field_name' => '会员等级', 'field_value' => 'mem_level'],
// ['field_name' => '生日', 'field_value' => 'mem_birthday'],
// ['field_name' => '来源', 'field_value' => 'mem_source'],
['field_name' => '欠款金额', 'field_value' => 'mem_arrears'],
['field_name' => '余额', 'field_value' => 'mem_rec_banlance'],
['field_name' => '积分', 'field_value' => 'mem_points'],
// ['field_name' => '余额', 'field_value' => 'mem_rec_banlance'],
// ['field_name' => '积分', 'field_value' => 'mem_points'],
['field_name' => '创建人', 'field_value' => 'mem_create_id'],
['field_name' => '邀请人', 'field_value' => 'mem_fid'],
// ['field_name' => '邀请人', 'field_value' => 'mem_fid'],
],
'ProPerformanceordersp' => [//销售员绩效
......
app/Http/Controllers/Api/ExcelInfo/ExceloutController.php
浏览文件 @ 3b11caaa
......@@ -105,11 +105,7 @@ class ExceloutController extends Controller
if ($v['ord_wor_state'] == '1') {
$rs[$k][$kg] = '待派单';
} elseif ($v['ord_wor_state'] == '2') {
if($v['orcl_appoint_time'] == '0000-00-00 00:00:00'){
$rs[$k][$kg] = '未预约';
}else{
$rs[$k][$kg] = '服务中';
}
$rs[$k][$kg] = '服务中';
} elseif ($v['ord_wor_state'] == '4') {
$rs[$k][$kg] = '待评价';
} elseif ($v['ord_wor_state'] == '20') {
......@@ -150,7 +146,7 @@ class ExceloutController extends Controller
if ($v['ord_payment_way'] == 0) {
$rs[$k][$kg] = '暂不结算';
} elseif ($v['ord_payment_way'] == 1) {
$rs[$k][$kg] = '现金';
$rs[$k][$kg] = '结算';
} elseif ($v['ord_payment_way'] == 2) {
$rs[$k][$kg] = '支付宝';
} elseif ($v['ord_payment_way'] == 3) {
......@@ -228,6 +224,8 @@ class ExceloutController extends Controller
// ->where('shop_id', $v['ord_shop_id'] )
// ->value('shop_store_name');
$rs[$k][$kg] = $ord_address_name;
} elseif($vg=='ord_openbill'){//是否开票1未开票2已开票
$rs[$k][$kg] = ($v['ord_openbill'] == 1)?'未开票':'已开票';
} else{
$rs[$k][$kg] = "\t".$v[$vg];
}
......
app/Http/Controllers/Api/MemberManage/MemberListController.php
浏览文件 @ 3b11caaa
......@@ -45,6 +45,11 @@ class MemberListController extends Controller
$list_data = DB::table('member')
->where('mem_cid', $user_info->adm_cid)
->where('mem_shop_id', $shop_id)
->where(function ($query) use ($search_data) {
if (!empty($search_data['mem_4sname'])) {
$query->where('mem_4sname', 'like', '%' . $search_data['mem_4sname'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['mem_name'])) {
$query->where('mem_name', 'like', '%' . $search_data['mem_name'] . '%');
......@@ -85,7 +90,7 @@ class MemberListController extends Controller
$query->where('mem_state', $search_data['mem_state']);
}
})
->select('mem_id', 'mem_name', 'mem_sex', 'mem_phone', 'mem_birthday', 'mem_car_num', 'mem_car_series', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_consume_money', 'mem_order_all', 'mem_retreat_trade', 'mem_bership', 'mem_source', 'mem_create_name', 'mem_create_id', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_arrears','mem_salesman_id', 'mem_points', 'mem_level', 'mem_fid', 'mem_car_color', 'mem_state')
->select('mem_id', 'mem_name', 'mem_sex', 'mem_phone', 'mem_birthday', 'mem_car_num', 'mem_car_series', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_consume_money', 'mem_order_all', 'mem_retreat_trade', 'mem_bership', 'mem_source', 'mem_create_name', 'mem_create_id', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_arrears','mem_salesman_id', 'mem_points', 'mem_level', 'mem_fid', 'mem_car_color', 'mem_state', 'mem_4sname')
->orderBy('mem_id', 'desc')
->paginate($page_size);
$list_items = $list_data->items();
......@@ -266,12 +271,13 @@ class MemberListController extends Controller
$mem_add_data['mem_shop_id'] = $user_info->adm_shop_id;
$mem_add_data['mem_superior_shop_id'] = $shop_id;
$mem_add_data['mem_name'] = $request['mem_name'];
$mem_add_data['mem_4sname'] = $request['mem_4sname'];
$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_sex'] = $request['mem_sex'];
$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_birthday'] = $request['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'] ? $request['mem_car_series'] : '';
$mem_add_data['mem_car_color'] = $request['mem_car_color'] ? $request['mem_car_color'] : '';
......@@ -286,9 +292,9 @@ class MemberListController extends Controller
$mem_id = MemberService::addMember($mem_add_data);
// $mem_id = DB::table('member')->insertGetId($mem_add_data);
// $mem_id = DB::table('member')->insertGetId($mem_add_data);
WashOrderService::addFestival($mem_id,$user_info);//新增节日提醒
// WashOrderService::addFestival($mem_id,$user_info);//新增节日提醒
//添加会员标签
MemberLabelService::addLabelToMember($mem_id,$request['mem_label'],$user_info);
// MemberLabelService::addLabelToMember($mem_id,$request['mem_label'],$user_info);
// 3.新增一个车辆信息
if ($request['mem_car_num']) {
......@@ -427,6 +433,7 @@ class MemberListController extends Controller
// 2 编辑一个手机号与车牌号的绑定关系
$mem_edit_data['mem_name'] = $request['mem_name'];
$mem_edit_data['mem_4sname'] = $request['mem_4sname'];
$mem_edit_data['mem_sex'] = $request['mem_sex'];
$mem_edit_data['mem_phone'] = $request['mem_phone'];
$mem_edit_data['mem_birthday'] = $request['mem_birthday'] ? $request['mem_birthday'] : '';
......@@ -445,7 +452,7 @@ class MemberListController extends Controller
->where('mem_id', $request['mem_id'])
->update($mem_edit_data);
//添加会员标签
MemberLabelService::addLabelToMember($request['mem_id'],$request['mem_label'],$user_info);
// MemberLabelService::addLabelToMember($request['mem_id'],$request['mem_label'],$user_info);
// 3.新增一个车辆信息
if ($request['mem_car_num']) {
$meca_add_data['meca_cid'] = $user_info->adm_cid;
......@@ -1173,10 +1180,10 @@ class MemberListController extends Controller
$objPHPExcel = $objReader->load($filename); //$filename可以是上传的表格，或者是指定的表格
$sheet = $objPHPExcel->getSheet(0); //excel中的第一张sheet
$highestRow = $sheet->getHighestRow(); // 取得总行数
if ($highestRow < 3) {
if ($highestRow < 2) {
return response()->json(['code' => 500, 'msg' => '未获取到会员数据', 'data' => '未获取到会员数据']);
}
if ($highestRow > 1503) {
if ($highestRow > 1501) {
return response()->json(['code' => 500, 'msg' => '一次最多导入1500条数据', 'data' => '一次最多导入1500条数据']);
}
......@@ -1185,32 +1192,25 @@ class MemberListController extends Controller
$a = 0;
$error = 0;
$melo_number = $user_info->adm_shop_id . time();
for ($j = 3; $j <= $highestRow; $j++) {
for ($j = 2; $j <= $highestRow; $j++) {
$message = '';
$add_mem['mem_cid'] = $user_info->adm_cid; //所属企业id
$add_mem['mem_shop_id'] = $user_info->adm_shop_id; //所属门店id
$add_mem['mem_superior_shop_id'] = $shop_id; //所属门店id
$add_mem['mem_create_time'] = date('Y-m-d H:i:s');
$add_mem['mem_create_time'] = trim($objPHPExcel->getActiveSheet()->getCell("A" . $j)->getValue());
$add_mem['mem_create_time'] = date('Y-m-d H:i:s', strtotime($add_mem['mem_create_time']));
$add_mem['mem_source'] = trim($objPHPExcel->getActiveSheet()->getCell("B" . $j)->getValue());
$add_mem['mem_4sname'] = trim($objPHPExcel->getActiveSheet()->getCell("A" . $j)->getValue());
// 名称
$add_mem['mem_name'] = trim($objPHPExcel->getActiveSheet()->getCell("C" . $j)->getValue());
if (empty($add_mem['mem_4sname'])) {
$message = '第'.$j.'行会员名称必填';
}
$add_mem['mem_name'] = trim($objPHPExcel->getActiveSheet()->getCell("B" . $j)->getValue());
if (empty($add_mem['mem_name'])) {
$message = '第'.$j.'行会员名称必填';
}
// 性别
$add_mem['mem_sex'] = trim($objPHPExcel->getActiveSheet()->getCell("D" . $j)->getValue());
if ($add_mem['mem_sex'] == '男') {
$add_mem['mem_sex'] = 1;
} elseif ($add_mem['mem_sex'] == '女') {
$add_mem['mem_sex'] = 2;
} else {
$add_mem['mem_sex'] = 3;
}
// 手机号
$add_mem['mem_phone'] = trim($objPHPExcel->getActiveSheet()->getCell("E" . $j)->getValue());
$add_mem['mem_phone'] = trim($objPHPExcel->getActiveSheet()->getCell("C" . $j)->getValue());
$find_mem = DB::table('member')
->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_phone', $add_mem['mem_phone'])
......@@ -1222,75 +1222,15 @@ class MemberListController extends Controller
$message = $message.',第'.$j.'行手机号已存在';
}
}
// 品牌
$add_mem['mem_car_brand'] = trim($objPHPExcel->getActiveSheet()->getCell("F" . $j)->getValue());
// if (empty($add_mem['mem_car_brand'])) {
// if (empty($messages)) {
// $message = '第'.$j.'行车辆品牌必填';
// } else {
// $message = $message.',第'.$j.'行品牌必填';
// }
// }
// 品牌车系
$add_mem['mem_car_series'] = $add_mem['mem_car_brand'] .'-'. trim($objPHPExcel->getActiveSheet()->getCell("G" . $j)->getValue());
// if (empty($add_mem['mem_car_series'])) {
// if (empty($messages)) {
// $message = '第'.$j.'行品牌车系必填';
// } else {
// $message = $message.',第'.$j.'行品牌车系必填';
// }
// }
// 车牌号
$add_mem['mem_car_num'] = $objPHPExcel->getActiveSheet()->getCell("H" . $j)->getValue();
$find_meca = false;
if (!empty($add_mem['mem_car_num'])) {
// 判断车牌号是否存在
$find_meca = DB::table('member_car')
->where('meca_cid', 1)
->where('meca_superior_shop_id', $user_info->adm_shop_id)
->where('meca_car_num', $add_mem['mem_car_num'])
->first(['meca_id']);
if ($find_meca) {
if (empty($messages)) {
$message = '第'.$j.'行车牌号已存在';
} else {
$message = $message.',第'.$j.'行车牌号已存在';
}
}
}
// else {
// if (empty($messages)) {
// $message = '第'.$j.'行车牌号不能为空';
// } else {
// $message = $message.',第'.$j.'行车牌号不能为空';
// }
// }
// 车架号
$meca_car_frame = trim($objPHPExcel->getActiveSheet()->getCell("I" . $j)->getValue());
// 省
$add_mem['mem_province'] = trim($objPHPExcel->getActiveSheet()->getCell("J" . $j)->getValue());
$add_mem['mem_province'] = trim($objPHPExcel->getActiveSheet()->getCell("D" . $j)->getValue());
// 市
$add_mem['mem_city'] = trim($objPHPExcel->getActiveSheet()->getCell("K" . $j)->getValue());
$add_mem['mem_city'] = trim($objPHPExcel->getActiveSheet()->getCell("E" . $j)->getValue());
// 县
$add_mem['mem_county'] = trim($objPHPExcel->getActiveSheet()->getCell("L" . $j)->getValue());
$add_mem['mem_county'] = trim($objPHPExcel->getActiveSheet()->getCell("F" . $j)->getValue());
// 详细地址
$add_mem['mem_address'] = trim($objPHPExcel->getActiveSheet()->getCell("M" . $j)->getValue());
$add_mem['mem_address'] = trim($objPHPExcel->getActiveSheet()->getCell("G" . $j)->getValue());
$add_log_res =false;
if (!empty($add_mem['mem_phone']) && $find_mem && (!empty($add_mem['mem_car_num']) || $meca_car_frame) && !$find_meca) {
$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'] = $user_info->adm_shop_id;
$meca_add_data['meca_create_adm_id'] = $user_info->adm_id;
$meca_add_data['meca_mem_id'] = $find_mem;
$meca_add_data['meca_car_num'] = $add_mem['mem_car_num'];
$meca_add_data['meca_car_series'] = $add_mem['mem_car_series'] ? $add_mem['mem_car_series'] : '';
$meca_add_data['meca_car_model'] = '';
$meca_add_data['meca_car_frame'] = $meca_car_frame ? $meca_car_frame : '';
$meca_res = DB::table('member_car')->insert($meca_add_data);
$add_log_res =true;
}
if ($message) {
$add_log['melo_state'] = 2;
if ($add_log_res) {
......@@ -1305,18 +1245,6 @@ class MemberListController extends Controller
}
} else {
$add_res = DB::table('member')->insertGetId($add_mem);
if (!empty($add_mem['mem_car_num']) || !empty($meca_car_frame)) {
$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'] = $user_info->adm_shop_id;
$meca_add_data['meca_create_adm_id'] = $user_info->adm_id;
$meca_add_data['meca_mem_id'] = $add_res;
$meca_add_data['meca_car_num'] = $add_mem['mem_car_num'];
$meca_add_data['meca_car_series'] = $add_mem['mem_car_series'] ? $add_mem['mem_car_series'] : '';
$meca_add_data['meca_car_model'] = '';
$meca_add_data['meca_car_frame'] = $meca_car_frame ? $meca_car_frame : '';
$meca_res = DB::table('member_car')->insert($meca_add_data);
}
$add_log['melo_state'] = 1;
$add_log['melo_message'] = '成功';
$add_log['melo_number'] = $melo_number;
......@@ -1329,8 +1257,8 @@ class MemberListController extends Controller
}
Common::addLog($user_info, getRealIp($request), '会员列表', '导入', '导入会员成功');
DB::commit();
$msg = '上传'.($highestRow - 2).'条，失败'.$error.'条';
return response()->json(['code' => 200, 'msg' => $msg, 'data' => $melo_number, 'num' => $highestRow - 2]);
$msg = '上传'.($highestRow - 1).'条，失败'.$error.'条';
return response()->json(['code' => 200, 'msg' => $msg, 'data' => $melo_number, 'num' => $highestRow - 1]);
} else {
return response()->json(['code' => 500, 'msg' => '上传有误，请重新上传！', 'data' => '上传有误，请重新上传！']);
}
......@@ -1360,6 +1288,11 @@ class MemberListController extends Controller
$query->where('mem_name', 'like', '%' . $search_data['mem_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['mem_4sname'])) {
$query->where('mem_4sname', 'like', '%' . $search_data['mem_4sname'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['mem_car_num'])) {
$query->where('mem_car_num', 'like', '%' . $search_data['mem_car_num'] . '%');
......@@ -1395,7 +1328,7 @@ class MemberListController extends Controller
$query->where('mem_state', $search_data['mem_state']);
}
})
->select('mem_id', 'mem_name', 'mem_sex', 'mem_phone', 'mem_birthday', 'mem_car_num', 'mem_car_series', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_consume_money', 'mem_order_all', 'mem_retreat_trade', 'mem_bership', 'mem_source', 'mem_create_name', 'mem_create_id', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_arrears','mem_salesman_id', 'mem_points', 'mem_level', 'mem_fid')
->select('mem_id', 'mem_name', 'mem_sex', 'mem_phone', 'mem_birthday', 'mem_car_num', 'mem_car_series', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_consume_money', 'mem_order_all', 'mem_retreat_trade', 'mem_bership', 'mem_source', 'mem_create_name', 'mem_create_id', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_arrears','mem_salesman_id', 'mem_points', 'mem_level', 'mem_fid', 'mem_4sname')
->orderBy('mem_id', 'desc')
->get()->toArray();
$data['sqls'] = DB::getQueryLog()[0];
......
app/Http/Controllers/Api/PublicsManage/PublicSearchController.php
浏览文件 @ 3b11caaa
......@@ -73,7 +73,11 @@ class PublicSearchController extends Controller
$user_info = Common::getUserInfo($request['api_token']);
$search_data = $request->all();
$public_search = new PublicSearch;
$list_data = $public_search->searchTechnician($user_info, $search_data, 10);
if (isset($request['noPage']) && $request['noPage'] == 1) {
$list_data = $public_search->searchTechnician($user_info, $search_data, 0);
} else {
$list_data = $public_search->searchTechnician($user_info, $search_data, 10);
}
return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$list_data['data_info']]);
}
......@@ -306,6 +310,11 @@ class PublicSearchController extends Controller
->where('sepr_state', 1) //状态1启用2停用
->where('sepr_delete', 1) //是否删除：1正常2已删除
->select($fields)
->where(function ($query) use ($request) { //服务项目名称
if (!empty($request['sepr_class_id'])) {
$query->whereIn('sepr_class_id', $request['sepr_class_id']);
}
})
->where(function ($query) use ($request) { //服务项目名称
if (!empty($request['keywords'])) {
$query->where('sepr_name', 'like', '%' . $request['keywords'] . '%');
......
app/Http/Controllers/Api/Verify/MemberManage/VerifyMemberListController.php
浏览文件 @ 3b11caaa
......@@ -63,14 +63,14 @@ class VerifyMemberListController extends Controller
// 数据验证
$validator = Validator::make($data, [
'mem_name' => 'required|max:20',
'mem_sex' => [
'required',
Rule::in(['1', '2', '3']),
], //mem_sex为1或者2
// 'mem_sex' => [
// 'required',
// Rule::in(['1', '2', '3']),
// ], //mem_sex为1或者2
'mem_phone' => ['required', 'regex:/^1[3456789]\d{9}$/'],
'mem_birthday' => 'sometimes|alpha_dash|max:5|min:5',
'mem_car_num' => 'required|max:10',
'mem_car_series' => 'required|max:30',
// 'mem_birthday' => 'sometimes|alpha_dash|max:5|min:5',
// 'mem_car_num' => 'required|max:10',
// 'mem_car_series' => 'required|max:30',
// 'mem_province' => 'required|max:50',
// 'mem_city' => 'required|max:50',
// 'mem_county' => 'required|max:50',
......
app/Http/Controllers/Api/Workbench/CashierDeskController.php
浏览文件 @ 3b11caaa
......@@ -3583,7 +3583,7 @@ class CashierDeskController extends Controller
$query->where('mem_id', $search_data['mem_id']);
}
})
->select('mem_id', 'mem_name', 'mem_phone', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_bership', 'mem_car_num', 'mem_source', 'mem_car_series', 'mem_sex', 'mem_birthday', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_level', 'mem_salesman_id')
->select('mem_id', 'mem_name', 'mem_phone', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_bership', 'mem_car_num', 'mem_source', 'mem_car_series', 'mem_sex', 'mem_birthday', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_level', 'mem_salesman_id', 'mem_4sname')
->paginate(30);
$data = $list->items();
//查找折扣
......@@ -3631,10 +3631,10 @@ class CashierDeskController extends Controller
->where('buac_del', 1)
->where('bucl_del', 1)
->where('bucl_state', 1)
->where('buac_state', 1)
->where(function ($query) use ($search_data) {
if (!empty($search_data['search_data'])) {
$query->where('bucl_name', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('buac_name', 'like', '%' . $search_data['search_data'] . '%')
$query->where('buac_name', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('buac_phone', 'like', '%' . $search_data['search_data'] . '%');
}
})
......
app/Http/Controllers/Mounting/Business/WashOrderController.php
浏览文件 @ 3b11caaa
......@@ -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';
$sea_button_data = 'createBill,export,orderType,basicSet,leadOpenBill';
$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]);
}
......@@ -96,6 +96,7 @@ class WashOrderController extends Controller
$error_message = (new WashOrderBasicValidator())->addValidator($request->all());
// $error_message = $this->dataService->mainValidator->addValidator($request->all());
}
if (!empty($error_message)) {
return $this->error($error_message, ErrorInc::INVALID_PARAM);
}
......@@ -109,6 +110,7 @@ class WashOrderController extends Controller
if (!isset($request['ware_id'])) {
request()->offsetSet('ware_id', 1);
}
request()->offsetSet('ord_type', 1);//个人会员
request()->offsetSet('ord_service_type', 1);//贴膜订单
request()->offsetSet('orcl_shipment_party', 1);
request()->offsetSet('ip', getRealIp($request));
......@@ -117,6 +119,7 @@ class WashOrderController extends Controller
$request['client_ip'] = getRealIp($request);
// 判断门店版本
$order_data = WashOrderBasicService::add($user_info, $request->all());
if ($order_data['code'] != 200) {
DB::rollBack();
return response()->json($order_data);
......@@ -131,6 +134,71 @@ class WashOrderController extends Controller
// 生成操作记录
$orlo_res = orderLog($user_info, $order_data['data']['ord_id'], 0, '生成订单');
OperationLog::addLog($user_info, $request['client_ip'], '订单列表', '生成订单', '生成订单' . $order_data['data']['ord_order_number'] . '成功');
if ($request['ord_add_work_state'] == 1) {//生成工单
$request['ord_id'] = $order_data['data']['ord_id'];
$post_data['ord_id'] = $order_data['data']['ord_id'];
$find_order_data = DB::table('order as ord')
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->where('ord_id', $order_data['data']['ord_id'])
->where('ord_shop_id', $user_info->adm_shop_id)
->select('ord_id', 'ord_order_number', 'ord_wor_state', 'ord_goods_quantity', 'ord_actual_price', 'ord_payment_way', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_remark', 'ord_order_price', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_adm_id', 'orcl_car_vin', 'orcl_car_brand_series', 'ord_ware_id', 'ord_client_id', 'ord_create_time', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain', 'ord_address_type', 'ord_address_id', 'orcl_business_name', 'orcl_business_id', 'orcl_sales_adm_id', 'ord_service_type', 'orcl_carbrse_type', 'ord_source', 'ord_other_system_number', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address')
->first();
$post_data['ord_service_type'] = $find_order_data->ord_service_type;
$post_data['ord_address_type'] = $find_order_data->ord_address_type;
$post_data['ord_address'] = $find_order_data->ord_address;
$post_data['ord_address_id'] = $find_order_data->ord_address_id;
$post_data['service_adm_data'][] = ['adm_id'=>$request['wor_service_adm_id']];
$order_data = WashOrderService::createWork($user_info, $post_data);
if ($order_data['code'] != 200) {
DB::rollBack();
return response()->json($order_data);
}
$find_wor_data = DB::table('work_order')
->where('wor_id', $order_data['data']['wor_id'])
->select('wor_service_adm_id')
->first();
// 添加技师消息
$add_data['adm_id'] = $find_wor_data->wor_service_adm_id;
$add_data['shop_id'] = $user_info->adm_shop_id;
$add_data['primary_id'] = $order_data['data']['wor_id']; //单据的主键id
$add_data['primary_type'] = 2; //单据类型：1订单2工单3预约单4售后单
$add_data['message_type'] = 1;
$add_data['primary_wor_state'] = 3; //状态1订单待派单2工单待派单3待接单
// $add_data['message_type'] = $data['message_type'];
$add_data['title'] = '派单通知'; //
$add_data['content'] = '您有新的工单，请及时处理'; //操作内容
$add_data['read_state'] = 1; //阅读状态：1未读2已读
$add_data['create_adm_name'] = $user_info->adm_name; //操作人姓名
$add_data['create_adm_id'] = $user_info->adm_id; //操作人id
$addAdminMessage_res = addAdminMessage($add_data);
// 订单历史记录
$data['wohi_primary_id'] = $request['ord_id'];
$data['wohi_state_name'] = '待施工';
$data['wohi_state'] = 2;
$data['wohi_type'] = 1;//1订单2工单
addHistory($data);
unset($data);
// 工单的历史记录
$data['wohi_primary_id'] = $order_data['data']['wor_id'];
$data['wohi_state_name'] = '已创建';
$data['wohi_state'] = 1;//服务状态：1已创建
$data['wohi_type'] = 2;//1订单2工单
addHistory($data);
unset($data);
// 工单的历史记录
$data['wohi_primary_id'] = $order_data['data']['wor_id'];
$data['wohi_state_name'] = '待接单';
$data['wohi_state'] = 2;//服务状态：2待接单
$data['wohi_type'] = 2;//1订单2工单
addHistory($data);
unset($data);
if ($addAdminMessage_res['code'] != 200) {
DB::rollBack();
return response()->json($addAdminMessage_res);
}
// 生成操作记录
$orlo_res = orderLog($user_info, $request['ord_id'], $order_data['data']['wor_id'], '生成订单同时生成工单');
}
if ($order_data['code'] == 200) {
DB::commit();
return $this->success('生成订单成功');
......@@ -152,27 +220,23 @@ class WashOrderController extends Controller
$order_data = DB::table('order as o')
->leftjoin('order_client as oc', 'oc.orcl_ord_id', '=', 'o.ord_id')
->where('ord_id', $request['ord_id'])
->select('ord_id', 'ord_orcl_id', 'ord_service_type', 'ord_state', 'ord_wor_quantity', 'ord_payment_way', 'ord_actual_price', 'ord_type', 'ord_remark', 'ord_ware_id', 'ord_client_id', 'ord_service_sepr_id', 'ord_service_adm_id', 'ord_collection_price', 'ord_service_shop_id', 'ord_order_number', 'ord_plus_minus', 'ord_order_plus_minus', 'orcl_shipment_party', 'orcl_rescue_assign_price', 'orcl_junk_type', 'orcl_whether_app', 'orcl_precise_lock', 'orcl_appoint_time', 'ord_delete', 'ord_wor_state', 'ord_create_time', 'ord_superior_shop_id as shop_id', 'ord_add_work_state', 'ord_other_payway', 'ord_new_type')
->select('ord_id', 'ord_orcl_id', 'ord_service_type', 'ord_state', 'ord_wor_quantity', 'ord_payment_way', 'ord_actual_price', 'ord_type', 'ord_remark', 'ord_ware_id', 'ord_client_id', 'ord_service_sepr_id', 'ord_service_adm_id', 'ord_collection_price', 'ord_service_shop_id', 'ord_order_number', 'ord_plus_minus', 'ord_order_plus_minus', 'orcl_shipment_party', 'orcl_rescue_assign_price', 'orcl_junk_type', 'orcl_whether_app', 'orcl_precise_lock', 'orcl_appoint_time', 'ord_delete', 'ord_wor_state', 'ord_create_time', 'ord_superior_shop_id as shop_id', 'ord_add_work_state', 'ord_other_payway', 'ord_new_type', 'orcl_business_name', 'orcl_business_id', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname')
->first();
// 判断发货单是否发货，已发货的不允许编辑
$dego_type = DB::table('dispatch_bill')
->where('dego_order_type', 1)
->where('dego_wor_id', $request['ord_id'])
->where('dego_original_number', $order_data->ord_order_number)
->value('dego_type');
if ($dego_type == 2) {
return response()->json(['code'=>500, 'msg'=>'当前订单的发货单已发货不允许编辑', 'data'=>'当前订单的发货单已发货不允许编辑']);
}
if ($order_data->ord_delete == 2) {
return ['code'=>500, 'msg'=>'当前订单已取消，无法编辑', 'data'=>'当前订单已取消，无法编辑'];
}
if ($order_data->ord_wor_quantity > 0) {
// 工单数量大于0，已经派工单
return ['code'=>500, 'msg'=>'当前订单已经派工单，无法编辑', 'data'=>'当前订单已经派工单，无法编辑'];
}
if ($order_data->ord_wor_state == 4) {
// 发货单发货之后，退货单退货入库之后订单就是完成状态
return ['code'=>500, 'msg'=>'当前订单已经完成，无法编辑', 'data'=>'当前订单已经完成，无法编辑'];
if (isset($request['again_order']) && $request['again_order'] == 1) {
// 再来一单
} else {
if ($order_data->ord_delete == 2) {
return ['code'=>500, 'msg'=>'当前订单已取消，无法编辑', 'data'=>'当前订单已取消，无法编辑'];
}
if ($order_data->ord_wor_quantity > 0) {
// 工单数量大于0，已经派工单
return ['code'=>500, 'msg'=>'当前订单已经派工单，无法编辑', 'data'=>'当前订单已经派工单，无法编辑'];
}
if ($order_data->ord_wor_state == 4) {
// 发货单发货之后，退货单退货入库之后订单就是完成状态
return ['code'=>500, 'msg'=>'当前订单已经完成，无法编辑', 'data'=>'当前订单已经完成，无法编辑'];
}
}
// $create_year_month = substr($order_data->ord_create_time, 0, 7); //创建时间年月
// $now_year_month = date('Y-m'); //当前年月
......@@ -206,6 +270,70 @@ class WashOrderController extends Controller
DB::rollBack();
return response()->json($order_data);
}
if ($request['ord_add_work_state'] == 1) {//生成工单
$find_order_data = DB::table('order as ord')
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->where('ord_id', $request['ord_id'])
->where('ord_shop_id', $user_info->adm_shop_id)
->select('ord_id', 'ord_order_number', 'ord_wor_state', 'ord_goods_quantity', 'ord_actual_price', 'ord_payment_way', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_remark', 'ord_order_price', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_adm_id', 'orcl_car_vin', 'orcl_car_brand_series', 'ord_ware_id', 'ord_client_id', 'ord_create_time', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain', 'ord_address_type', 'ord_address_id', 'orcl_business_name', 'orcl_business_id', 'orcl_sales_adm_id', 'ord_service_type', 'orcl_carbrse_type', 'ord_source', 'ord_other_system_number', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address')
->first();
$post_data['ord_id'] = $find_order_data->ord_id;
$post_data['ord_service_type'] = $find_order_data->ord_service_type;
$post_data['ord_address_type'] = $find_order_data->ord_address_type;
$post_data['ord_address'] = $find_order_data->ord_address;
$post_data['ord_address_id'] = $find_order_data->ord_address_id;
$post_data['service_adm_data'][] = ['adm_id'=>$request['wor_service_adm_id']];
$order_data = WashOrderService::createWork($user_info, $post_data);
if ($order_data['code'] != 200) {
DB::rollBack();
return response()->json($order_data);
}
$find_wor_data = DB::table('work_order')
->where('wor_id', $order_data['data']['wor_id'])
->select('wor_service_adm_id')
->first();
// 添加技师消息
$add_data['adm_id'] = $find_wor_data->wor_service_adm_id;
$add_data['shop_id'] = $user_info->adm_shop_id;
$add_data['primary_id'] = $order_data['data']['wor_id']; //单据的主键id
$add_data['primary_type'] = 2; //单据类型：1订单2工单3预约单4售后单
$add_data['message_type'] = 1;
$add_data['primary_wor_state'] = 3; //状态1订单待派单2工单待派单3待接单
// $add_data['message_type'] = $data['message_type'];
$add_data['title'] = '派单通知'; //
$add_data['content'] = '您有新的工单，请及时处理'; //操作内容
$add_data['read_state'] = 1; //阅读状态：1未读2已读
$add_data['create_adm_name'] = $user_info->adm_name; //操作人姓名
$add_data['create_adm_id'] = $user_info->adm_id; //操作人id
$addAdminMessage_res = addAdminMessage($add_data);
// 订单历史记录
$data['wohi_primary_id'] = $request['ord_id'];
$data['wohi_state_name'] = '待施工';
$data['wohi_state'] = 2;
$data['wohi_type'] = 1;//1订单2工单
addHistory($data);
unset($data);
// 工单的历史记录
$data['wohi_primary_id'] = $order_data['data']['wor_id'];
$data['wohi_state_name'] = '已创建';
$data['wohi_state'] = 1;//服务状态：1已创建
$data['wohi_type'] = 2;//1订单2工单
addHistory($data);
unset($data);
// 工单的历史记录
$data['wohi_primary_id'] = $order_data['data']['wor_id'];
$data['wohi_state_name'] = '待接单';
$data['wohi_state'] = 2;//服务状态：2待接单
$data['wohi_type'] = 2;//1订单2工单
addHistory($data);
unset($data);
if ($addAdminMessage_res['code'] != 200) {
DB::rollBack();
return response()->json($addAdminMessage_res);
}
// 生成操作记录
$orlo_res = orderLog($user_info, $request['ord_id'], $order_data['data']['wor_id'], '生成订单同时生成工单');
}
// 生成操作记录
$orlo_res = orderLog($user_info, $request['ord_id'], 0, '编辑订单');
if ($orlo_res) {
......@@ -851,48 +979,44 @@ class WashOrderController extends Controller
$ord_id = array_column($ord_id, 'ord_id');
DB::connection()->enableQueryLog();#开启执行日志
$data = DB::table('order as ord')
->leftJoin('order_client as orcl', 'orcl.orcl_ord_id', '=', 'ord.ord_id')
->rightJoin('order_goods as orgo', 'orgo.orgo_ord_id', '=', 'ord.ord_id')
->leftJoin('shop as shop', 'shop.shop_id', '=', 'ord.ord_shop_id')
->leftJoin('admin as admin', 'admin.adm_id', '=', 'ord.ord_create_id')
->leftJoin('work_order', 'wor_order_id', '=', 'ord_id')
->where('ord_shop_id', $user_info->adm_shop_id)
->where('ord_collection_bill', 1) //是否代收账单：1正常订单2代收账单
->where('ord_classify', 2) //工单分类：1蓄电池2洗美店3易损件
->where('ord_is_split', '<>', 3) //订单是否拆分，1是2否
->whereNotIn('ord_id', $ord_id)
->where(function ($query) use ($search_data) { //订单类型搜索
if (!empty($search_data['ord_service_type'])) {
$query->whereIn('ord_service_type', $search_data['ord_service_type']);
}
})
// ->whereNotIn('ord_id', $ord_ids)
->where(function ($query) use ($search_data) { //关键字搜索
if (!empty($search_data['keywords'])) {
$query->where('orcl_phone', 'like', '%' . $search_data['keywords'] . '%')
->orwhere('orcl_name', 'like', '%' . $search_data['keywords'] . '%')
->orwhere('ord_order_number', 'like', '%' . $search_data['keywords'] . '%')
->orwhere('orcl_car_num', 'like', '%' . $search_data['keywords'] . '%');
->orwhere('orcl_car_num', 'like', '%' . $search_data['keywords'] . '%')
->orwhere('orcl_car_brand_series', 'like', '%' . $search_data['keywords'] . '%')
->orwhere('adm_name', 'like', '%' . $search_data['keywords'] . '%');
}
})
->where(function ($query) use ($search_data) { //销售人员搜索
if (!empty($search_data['orcl_sales_adm_id'])) {
$query->where('orcl_sales_adm_id', $search_data['orcl_sales_adm_id']);
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_order_number'])) {
$query->where('ord_order_number', 'like', '%' . $search_data['ord_order_number'] . '%')
->Orwhere('ord_other_system_number', 'like', '%' . $search_data['ord_order_number'] . '%')
->Orwhere('ord_other_order_num', 'like', '%' . $search_data['ord_order_number'] . '%');
}
})
->where(function ($query) use ($search_data) { //订单分类：1蓄电池2洗美店3易损件
if (!empty($search_data['ord_classify'])) {
$query->where('ord_classify', $search_data['ord_classify']);
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_business_name'])) {
$query->where('orcl_business_name', 'like', '%' . $search_data['orcl_business_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_order_number'])) {
$query->where('ord_order_number', 'like', '%' . $search_data['ord_order_number'] . '%');
if (!empty($search_data['orcl_buac_name'])) {
$query->where('orcl_buac_name', 'like', '%' . $search_data['orcl_buac_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_name'])) {
$query->where('orcl_name', 'like', '%' . $search_data['orcl_name'] . '%');
if (!empty($search_data['orcl_buac_phone'])) {
$query->where('orcl_buac_phone', 'like', '%' . $search_data['orcl_buac_phone'] . '%');
}
})
->where(function ($query) use ($search_data) {
......@@ -901,13 +1025,13 @@ class WashOrderController extends Controller
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_carowner_name'])) {
$query->where('orcl_carowner_name', 'like', '%' . $search_data['orcl_carowner_name'] . '%');
if (!empty($search_data['orcl_name'])) {
$query->where('orcl_name', 'like', '%' . $search_data['orcl_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_carowner_phone'])) {
$query->where('orcl_carowner_phone', 'like', '%' . $search_data['orcl_carowner_phone'] . '%');
if (!empty($search_data['orcl_phone'])) {
$query->where('orcl_phone', 'like', '%' . $search_data['orcl_phone'] . '%');
}
})
->where(function ($query) use ($search_data) {
......@@ -915,36 +1039,41 @@ class WashOrderController extends Controller
$query->where('orcl_car_num', 'like', '%' . $search_data['orcl_car_num'] . '%');
}
})
->where(function ($query) use ($search_data) { //车架号车辆识别码
if (!empty($search_data['orcl_car_vin'])) {
$query->where('orcl_car_vin', 'like', '%' . $search_data['orcl_car_vin'] . '%');
}
})
->where(function ($query) use ($search_data) { //买家类型：1会员零售2企业客户
if (!empty($search_data['ord_type'])) {
$query->where('ord_type', $search_data['ord_type']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_create_id'])) {
$query->where('ord_create_id', $search_data['ord_create_id']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_state'])) {
$query->where('ord_state', $search_data['ord_state']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_source'])) {
$query->where('ord_source', $search_data['ord_source']);
if (in_array($search_data['ord_wor_state'], [200,201,202,203,204,205])) {
if ($search_data['ord_wor_state'] == 200) {
$query->where('wor_state', 2);
}
if ($search_data['ord_wor_state'] == 201) {
$query->where('wor_state', 5);
}
if ($search_data['ord_wor_state'] == 202) {
$query->where('wor_state', 7);
}
if ($search_data['ord_wor_state'] == 203) {
$query->where('wor_state', 8);
}
if ($search_data['ord_wor_state'] == 204) {
$query->where('wor_state', 9);
}
if ($search_data['ord_wor_state'] == 205) {
$query->where('wor_state', 10);
}
$search_data['ord_wor_state'] = 2;
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] != 21) {
$query->where('ord_wor_state', $search_data['ord_wor_state']);
// ord_suspended是否挂起1是2否
if (!empty($search_data['ord_wor_state']) && !in_array($search_data['ord_wor_state'],[21,22,])) {
$query->where('ord_wor_state', $search_data['ord_wor_state'])
->where('ord_suspended', 2);
} elseif (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] == 21) {
$query->whereIn('ord_wor_state', [4,20]);
// 挂起
$query->whereIn('ord_wor_state', [4,20])
->where('ord_suspended', 2);
} elseif (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] == 22) {
$query->where('ord_suspended', 1);
}
if ($search_data['ord_wor_state'] == 2 && isset($search_data['appoint']) && $search_data['appoint'] == 2){
$query->where('orcl_appoint_time', '0000-00-00 00:00:00');
}
})
->where(function ($query) use ($search_data) {
......@@ -953,14 +1082,8 @@ class WashOrderController extends Controller
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orgo_goo_name'])) {
$query->where('orgo_goo_name', $search_data['orgo_goo_name']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orgo_goo_goods_encode'])) {
$query->where('orgo_goo_type', 3)
->where('orgo_goo_goods_encode', $search_data['orgo_goo_goods_encode']);
if (!empty($search_data['ord_state'])) {
$query->where('ord_state', $search_data['ord_state']);
}
})
->where(function ($query) use ($search_data) { //创建时间
......@@ -979,27 +1102,6 @@ class WashOrderController extends Controller
}
}
})
->where(function ($query) use ($search_data) { //预约时间
// 如果选择开始时间并且选择结束时间
if (!empty($search_data['appoint_time_start']) && !empty($search_data['appoint_time_end'])) {
$query->whereBetween('orcl_appoint_time', [$search_data['appoint_time_start'], $search_data['appoint_time_end'] . ' 23:59:59']);
} else {
// 如果选择开始时间
if (!empty($search_data['appoint_time_start'])) {
$query->where('orcl_appoint_time', '>=', $search_data['appoint_time_start']);
} else {
// 如果选择结束时间
if (!empty($search_data['appoint_time_end'])) {
$query->where('orcl_appoint_time', '<=', $search_data['appoint_time_end'] . ' 23:59:59');
}
}
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_client_id'])) {
$query->where('ord_client_id', $search_data['ord_client_id']);
}
})
->where(function ($query) use ($search_data) { //实际金额区间搜索
// 如果选择最小钱数并且选择最大钱数
if (!empty($search_data['min_price']) && !empty($search_data['max_price'])) {
......@@ -1016,17 +1118,157 @@ class WashOrderController extends Controller
}
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_address_type']) && !empty($search_data['ord_address_id'])) {
$query->where('ord_address_type', $search_data['ord_address_type'])
->where('ord_address_id', $search_data['ord_address_id']);
}
})
//->select('ord_id', 'ord_order_number','orgo_goo_name','orgo_goo_quantity', 'orgo_goo_goods_encode', 'ord_ware_id', 'ord_order_price', 'ord_actual_price', 'ord_state', 'ord_type', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'ord_create_time', 'orcl_client_id', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_zero_price', '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_service_type', 'ord_service_sepr_id', 'orcl_rescue_service_price', 'orgo_state', 'orgo_goo_price', 'ord_client_id', 'ord_ware_id', 'orgo_goo_goods_encode')
->select('ord_id', 'ord_order_number','ord_wor_state','orgo_state','ord_source','orgo_goo_name','orgo_goo_unit','orgo_goo_quantity', 'orgo_goo_goods_encode', 'ord_ware_id', 'ord_order_price', 'ord_actual_price', 'ord_state', 'ord_payment_way','ord_settlement_time','orcl_client_id', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_car_brand_series', 'ord_type','orcl_mem_source', 'orcl_carowner_name', 'orcl_carowner_phone' ,'orcl_sales_adm_id' ,'ord_create_id', 'ord_service_adm_id', 'orcl_appoint_time','ord_create_time', 'ord_wor_quantity', 'ord_zero_price', 'orcl_car_vin', 'ord_address', 'orcl_business_name', 'ord_shop_id', 'ord_address_type','ord_service_type', 'ord_settlement_adm_id', 'orcl_carbrse_type', 'ord_explain', 'ord_service_type', 'ord_service_sepr_id', 'orcl_rescue_service_price', 'orgo_goo_price', 'ord_client_id', 'ord_ware_id', 'ord_delete' ,'ord_address_id','shop_store_name','adm_name')
->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')
->orderBy('ord_id', $orderby_type)
//->groupBy('ord_id')
->get()->toArray();
// $data = DB::table('order as ord')
// ->leftJoin('order_client as orcl', 'orcl.orcl_ord_id', '=', 'ord.ord_id')
// ->rightJoin('order_goods as orgo', 'orgo.orgo_ord_id', '=', 'ord.ord_id')
// ->leftJoin('shop as shop', 'shop.shop_id', '=', 'ord.ord_shop_id')
// ->leftJoin('admin as admin', 'admin.adm_id', '=', 'ord.ord_create_id')
// ->where('ord_shop_id', $user_info->adm_shop_id)
// ->where('ord_collection_bill', 1) //是否代收账单：1正常订单2代收账单
// ->where('ord_classify', 2) //工单分类：1蓄电池2洗美店3易损件
// ->where('ord_is_split', '<>', 3) //订单是否拆分，1是2否
// ->whereNotIn('ord_id', $ord_id)
// ->where(function ($query) use ($search_data) { //订单类型搜索
// if (!empty($search_data['ord_service_type'])) {
// $query->whereIn('ord_service_type', $search_data['ord_service_type']);
// }
// })
// ->where(function ($query) use ($search_data) { //关键字搜索
// if (!empty($search_data['keywords'])) {
// $query->where('orcl_phone', 'like', '%' . $search_data['keywords'] . '%')
// ->orwhere('orcl_name', 'like', '%' . $search_data['keywords'] . '%')
// ->orwhere('ord_order_number', 'like', '%' . $search_data['keywords'] . '%')
// ->orwhere('orcl_car_num', 'like', '%' . $search_data['keywords'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) { //销售人员搜索
// if (!empty($search_data['orcl_sales_adm_id'])) {
// $query->where('orcl_sales_adm_id', $search_data['orcl_sales_adm_id']);
// }
// })
// ->where(function ($query) use ($search_data) { //订单分类：1蓄电池2洗美店3易损件
// if (!empty($search_data['ord_classify'])) {
// $query->where('ord_classify', $search_data['ord_classify']);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_order_number'])) {
// $query->where('ord_order_number', 'like', '%' . $search_data['ord_order_number'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['orcl_name'])) {
// $query->where('orcl_name', 'like', '%' . $search_data['orcl_name'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['orcl_phone'])) {
// $query->where('orcl_phone', 'like', '%' . $search_data['orcl_phone'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['orcl_carowner_name'])) {
// $query->where('orcl_carowner_name', 'like', '%' . $search_data['orcl_carowner_name'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['orcl_carowner_phone'])) {
// $query->where('orcl_carowner_phone', 'like', '%' . $search_data['orcl_carowner_phone'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['orcl_car_num'])) {
// $query->where('orcl_car_num', 'like', '%' . $search_data['orcl_car_num'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) { //车架号车辆识别码
// if (!empty($search_data['orcl_car_vin'])) {
// $query->where('orcl_car_vin', 'like', '%' . $search_data['orcl_car_vin'] . '%');
// }
// })
// ->where(function ($query) use ($search_data) { //买家类型：1会员零售2企业客户
// if (!empty($search_data['ord_type'])) {
// $query->where('ord_type', $search_data['ord_type']);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_create_id'])) {
// $query->where('ord_create_id', $search_data['ord_create_id']);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_state'])) {
// $query->where('ord_state', $search_data['ord_state']);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_source'])) {
// $query->where('ord_source', $search_data['ord_source']);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] != 21) {
// $query->where('ord_wor_state', $search_data['ord_wor_state']);
// } elseif (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] == 21) {
// $query->whereIn('ord_wor_state', [4,20]);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_payment_way'])) {
// $query->where('ord_payment_way', $search_data['ord_payment_way']);
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['orgo_goo_name'])) {
// $query->where('orgo_goo_name', $search_data['orgo_goo_name']);
// }
// })
// ->where(function ($query) use ($search_data) { //创建时间
// // 如果选择开始时间并且选择结束时间
// if (!empty($search_data['create_time_start']) && !empty($search_data['create_time_end'])) {
// $query->whereBetween('ord_create_time', [$search_data['create_time_start'], $search_data['create_time_end'] . ' 23:59:59']);
// } else {
// // 如果选择开始时间
// if (!empty($search_data['create_time_start'])) {
// $query->where('ord_create_time', '>=', $search_data['create_time_start']);
// } else {
// // 如果选择结束时间
// if (!empty($search_data['create_time_end'])) {
// $query->where('ord_create_time', '<=', $search_data['create_time_end'] . ' 23:59:59');
// }
// }
// }
// })
// ->where(function ($query) use ($search_data) {
// if (!empty($search_data['ord_client_id'])) {
// $query->where('ord_client_id', $search_data['ord_client_id']);
// }
// })
// ->where(function ($query) use ($search_data) { //实际金额区间搜索
// // 如果选择最小钱数并且选择最大钱数
// if (!empty($search_data['min_price']) && !empty($search_data['max_price'])) {
// $query->whereBetween('ord_actual_price', [$search_data['min_price'] * 100, $search_data['max_price'] * 100]);
// } else {
// // 如果选择最小钱数
// if (!empty($search_data['min_price'])) {
// $query->where('ord_actual_price', '>=', $search_data['min_price'] * 100);
// } else {
// // 如果选择最大钱数
// if (!empty($search_data['max_price'])) {
// $query->where('ord_actual_price', '<=', $search_data['max_price'] * 100);
// }
// }
// }
// })
// //->select('ord_id', 'ord_order_number','orgo_goo_name','orgo_goo_quantity', 'orgo_goo_goods_encode', 'ord_ware_id', 'ord_order_price', 'ord_actual_price', 'ord_state', 'ord_type', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'ord_create_time', 'orcl_client_id', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_zero_price', '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_service_type', 'ord_service_sepr_id', 'orcl_rescue_service_price', 'orgo_state', 'orgo_goo_price', 'ord_client_id', 'ord_ware_id', 'orgo_goo_goods_encode')
// ->select('ord_id', 'ord_order_number','ord_wor_state','orgo_state','ord_source','orgo_goo_name','orgo_goo_unit','orgo_goo_quantity', 'orgo_goo_goods_encode', 'ord_ware_id', 'ord_order_price', 'ord_actual_price', 'ord_state', 'ord_payment_way','ord_settlement_time','orcl_client_id', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_car_brand_series', 'ord_type','orcl_mem_source', 'orcl_carowner_name', 'orcl_carowner_phone' ,'orcl_sales_adm_id' ,'ord_create_id', 'ord_service_adm_id', 'orcl_appoint_time','ord_create_time', 'ord_wor_quantity', 'ord_zero_price', 'orcl_car_vin', 'ord_address', 'orcl_business_name', 'ord_shop_id', 'ord_address_type','ord_service_type', 'ord_settlement_adm_id', 'orcl_carbrse_type', 'ord_explain', 'ord_service_type', 'ord_service_sepr_id', 'orcl_rescue_service_price', 'orgo_goo_price', 'ord_client_id', 'ord_ware_id', 'ord_delete' ,'ord_address_id','shop_store_name','adm_name')
// ->orderBy('ord_id', $orderby_type)
// //->groupBy('ord_id')
// ->get()->toArray();
$data['sqls'] = DB::getQueryLog()[0];
$sqls = $data['sqls'];
$excel = new CommonController();
......@@ -2225,6 +2467,12 @@ class WashOrderController extends Controller
}
$res = WashOrderService::openBill($user_info, $request);
$order = DB::table('order')
->where('ord_id', $request['ord_id'])
->select('ord_order_number')
->first();
$orlo_res = orderLog($user_info, $request['ord_id'], '', '订单开票');
OperationLog::addLog($user_info, getRealIp($request), '订单列表', '订单开票', '订单开票'. $order->ord_order_number . '成功');
return response()->json($res);
}
......@@ -2263,4 +2511,128 @@ class WashOrderController extends Controller
}
return response()->json($res);
}
/**
* 批量开票
* @authors ldj
* @email 909490343@qq.com
* @date 2026-02-10
* @param Request $request [description]
* @return [type] [description]
*/
// 批量新增导入
public function leadOpenBill(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['type'] == 1) {
return response()->json(['code' => 200, 'msg' => 'success', 'data' => config('apisystem.server_name_https') . '/storage/Template/leadOpenBill.xlsx']);
}
$file = $request->file('file');
if ($file->isValid()) {
// 获取表格的大小，限制上传表格的大小5M
$file_size = $_FILES['file']['size'];
if ($file_size > 5 * 1024 * 1024) {
return response()->json(['code' => 500, 'msg' => '文件大小不能超过5M', 'data' => '文件大小不能超过5M']);
}
// 限制上传表格类型
$ext = $file->getClientOriginalExtension(); //文件拓展名
if ($ext != 'xlsx') {
return response()->json(['code' => 500, 'msg' => '仅允许上传以xlsx结尾的后缀文件', 'data' => '仅允许上传以xlsx结尾的后缀文件']);
}
// 有Xls和Xlsx格式两种
$objReader = IOFactory::createReader('Xlsx');
$filename = $_FILES['file']['tmp_name'];
$objPHPExcel = $objReader->load($filename); //$filename可以是上传的表格，或者是指定的表格
$sheet = $objPHPExcel->getSheet(0); //excel中的第一张sheet
$highestRow = $sheet->getHighestRow(); // 取得总行数
if ($highestRow < 2) {
return response()->json(['code' => 500, 'msg' => '未获取到开票数据', 'data' => '未获取到开票数据']);
}
if ($highestRow > 1501) {
return response()->json(['code' => 500, 'msg' => '一次最多导入1500条数据', 'data' => '一次最多导入1500条数据']);
}
// 循环读取excel表格，整合成数组,如果是不指定key的二维,就用$data[i][j]表示。
DB::beginTransaction();
$error = 0;
$i = 0;
for ($j = 2; $j <= $highestRow; $j++) {
$message = '';
$order_number = trim($objPHPExcel->getActiveSheet()->getCell("A" . $j)->getValue());
$ord_other_system_number = trim($objPHPExcel->getActiveSheet()->getCell("B" . $j)->getValue());
$open_bill_number = trim($objPHPExcel->getActiveSheet()->getCell("C" . $j)->getValue());
if (empty($order_number) && empty($ord_other_system_number)) {
$message = $message.',第'.$j.'行，订单编号和报案号都是空';
continue;
}
if (empty($open_bill_number)) {
$message = $message.',第'.$j.'行，请填写发票号';
continue;
}
if (!empty($ord_other_system_number)) {
$order1 = DB::table('order')
->where('ord_other_system_number', $ord_other_system_number)
->select('ord_id')
->first();
if (empty($order1)) {
$message = $message.',第'.$j.'行，报案号:'.$ord_other_system_number.'未查询到此订单';
continue;
}
} else {
$order1 = false;
}
if (!empty($order_number)) {
$order2 = DB::table('order')
->where('ord_order_number', $order_number)
->select('ord_id')
->first();
if (empty($order2)) {
$message = $message.',第'.$j.'行，订单编号:'.$order_number.'未查询到此订单';
continue;
}
} else {
$order2 = false;
}
if ($order1 && $order2) {
if ($order1->ord_id != $order2->ord_id) {
$message = $message.',第'.$j.'行，订单编号:'.$order_number.'报案号:'.$ord_other_system_number.'不是同一个订单！';
continue;
}
}
$all_data[$i]['order_number'] = $order_number;
$all_data[$i]['ord_other_system_number'] = $ord_other_system_number;
$all_data[$i]['open_bill_number'] = $open_bill_number;
$all_data[$i]['ord_id'] = $open_bill_number;
$i++;
}
if ($message) {
return response()->json(['code' => 500, 'msg' => $message, 'data' => '上传有误，请重新上传！']);
}
foreach ($all_data as $key => $value) {
if ($value['ord_other_system_number']) {
$update_order = DB::table('order')
->where('ord_other_system_number', $value['ord_other_system_number'])
->update(['ord_openbill'=>2,'ord_openbill_number'=>$value['open_bill_number']]);
} else {
$update_order = DB::table('order')
->where('ord_order_number', $value['order_number'])
->update(['ord_openbill'=>2,'ord_openbill_number'=>$value['open_bill_number']]);
}
}
OperationLog::addLog($user_info, getRealIp($request), '订单列表', '批量开票', '批量开票成功');
DB::commit();
$msg = '上传'.($highestRow - 1).'条，失败'.$error.'条';
return response()->json(['code' => 200, 'msg' => $msg, 'data' =>'', 'num' => $highestRow - 1]);
} else {
return response()->json(['code' => 500, 'msg' => '上传有误，请重新上传！', 'data' => '上传有误，请重新上传！']);
}
}
}
app/Http/Controllers/Mounting/Operation/BusinessController.php
浏览文件 @ 3b11caaa
......@@ -63,7 +63,7 @@ class BusinessController extends Controller
}
// 查询字段
$field_columns = ['buac_id', 'buac_name', 'buac_phone', 'buac_create_time', 'buac_create_adm_id', 'buac_sex'];
$field_columns = ['buac_id', 'buac_name', 'buac_phone', 'buac_create_time', 'buac_create_adm_id', 'buac_sex', 'buac_state'];
$user_info = LoginUserService::getUser();
$search_data = $this->dataService->accIndex($user_info, $request->all(), 10, $field_columns);
if (empty($search_data)) {
......@@ -626,4 +626,27 @@ class BusinessController extends Controller
return response()->json(['code' => 200, 'msg' => '暂无此会员', 'data' =>'']);
}
}
/**
* 停启用保险公司员工
* @authors ldj
* @email 909490343@qq.com
* @date 2026-02-05
* @param Request $request [description]
* @return [type] [description]
*/
public function editAccState(Request $request)
{
// 获取当前操作账号信息
$user_info = Common::getUserInfo($request['api_token']);
if (empty($request['buac_id'])) {
return response()->json(['code' => 500, 'msg' => '请选择定损员', 'data' =>[]]);
}
$result = BusinessService::editAccState($request);
if ($result) {
return response()->json(['code' => 200, 'msg' => '操作成功', 'data' => $result]);
} else {
return response()->json(['code' => 200, 'msg' => '操作失败', 'data' =>'']);
}
}
}
\ No newline at end of file
app/Http/Requests/Validators/Business/WashOrderBasicValidator.php
浏览文件 @ 3b11caaa
......@@ -46,11 +46,11 @@ class WashOrderBasicValidator extends FormRequest
'orcl_carowner_phone.max' => '车主电话长度超过最大限制',
'ord_payment_way.required' => '请选择结算方式',
'ord_type.required' => '请选择买家类型',
'ord_address.required' => '请选择施工门店',
'ord_address_type.required' => '请选择施工门店',
'ord_address_id.required' => '请选择施工门店',
'ord_address_id.integer' => '请选择施工门店',
'ord_address_id.min' => '请选择施工门店',
// 'ord_address.required' => '请选择施工门店1',
// 'ord_address_type.required' => '请选择施工门店2',
// 'ord_address_id.required' => '请选择施工门店3',
// 'ord_address_id.integer' => '请选择施工门店4',
// 'ord_address_id.min' => '请选择施工门店5',
'ord_address.max' => '地址长度超过最大限制',
'ord_client_id.required' => '请选择客户信息',
'ord_client_id.integer' => '数据类型不正确',
......@@ -77,15 +77,14 @@ class WashOrderBasicValidator extends FormRequest
'orcl_phone' => ['sometimes', 'required','regex:/^1[3456789]\d{9}$/'],// 客户手机号
'orcl_carowner_name' => 'sometimes|required|max:20', //车主姓名
'orcl_carowner_phone' => 'sometimes|required|max:11', //车主电话
'ord_address' => 'required|max:255',
'ord_address_type' => 'required|integer|min:1',
'ord_address_id' => 'required|integer|min:1',
'ord_client_id' => 'sometimes|required|integer|min:1',
'ware_id' => 'sometimes|required|integer|min:1',
// 'ord_address' => 'required|max:255',
// 'ord_address_type' => 'required|integer|min:1',
// 'ord_address_id' => 'required|integer|min:1',
// 'ord_client_id' => 'sometimes|required|integer|min:1',
// 'ware_id' => 'sometimes|required|integer|min:1',
'goods_data' => 'required',
'ord_add_work_state' => 'required',
], $messages);
// 判断数据验证是否成功
if ($validator->fails()) {
$messages = $validator->errors()->all();
......
app/Http/Requests/Validators/Business/WashOrderValidator.php
浏览文件 @ 3b11caaa
......@@ -90,9 +90,9 @@ class WashOrderValidator extends FormRequest
'orcl_phone' => ['required','regex:/^1[3456789]\d{9}$/'],// 客户手机号
'orcl_carowner_name' => 'required|max:20', //车主姓名
'orcl_carowner_phone' => 'required|max:11', //车主电话
'ord_address' => 'required|max:255',
'ord_address_type' => 'required',
'ord_address_id' => 'required',
// 'ord_address' => 'required|max:255',
// 'ord_address_type' => 'required',
// 'ord_address_id' => 'required',
'ord_client_id' => 'required|integer|min:0',
'reli_id' => 'sometimes|nullable|integer|min:0',
], $messages);
......@@ -185,10 +185,10 @@ class WashOrderValidator extends FormRequest
'ord_address' => 'required|max:255',
'ord_address_type' => 'required',
'ord_address_id' => 'required',
'orcl_name' => 'required|max:20', //客户姓名
'orcl_carowner_name' => 'required|max:20', //车主姓名
'orcl_carowner_phone' => 'sometimes|max:11', //车主电话
'orcl_channel_unit' => 'sometimes|required_if:ord_type,2|max:50',
// 'orcl_name' => 'required|max:20', //客户姓名
// 'orcl_carowner_name' => 'required|max:20', //车主姓名
// 'orcl_carowner_phone' => 'sometimes|max:11', //车主电话
// 'orcl_channel_unit' => 'sometimes|required_if:ord_type,2|max:50',
'ord_client_id' => 'required|integer|min:0',
// 'orcl_check_car_state' => [//是否验车：1是2否
// 'required',
......
app/Http/Requests/Validators/Operation/BusinessValidator.php
浏览文件 @ 3b11caaa
......@@ -101,8 +101,8 @@ class BusinessValidator extends FormRequest
// 数据验证
$validator = Validator::make($data, [
'bucl_name' => 'required|max:20', //客户姓名
'bucl_user_name' => 'required|max:20', //车主姓名
'bucl_user_phone' => 'required|max:11', //车主电话
// 'bucl_user_name' => 'required|max:20', //车主姓名
// 'bucl_user_phone' => 'required|max:11', //车主电话
// 'bucl_province' => 'required|max:50',
// 'bucl_city' => 'required|max:50',
// 'bucl_county' => 'required|max:50',
......@@ -131,7 +131,7 @@ class BusinessValidator extends FormRequest
// 数据验证
$validator = Validator::make($data, [
'bucl_id' => 'required', //企业客户id
'buac_password' => 'required', //客户密码
// 'buac_password' => 'required', //客户密码
'buac_name' => 'required|max:20', //客户姓名
'buac_phone' => 'required|max:11', //车主电话
], $messages);
......
app/Requests/Validators/Business/WashOrderValidator.php
浏览文件 @ 3b11caaa
......@@ -184,7 +184,7 @@ class WashOrderValidator extends FormRequest
'ord_city' => 'required|max:50',
'ord_county' => 'required|max:50',
'ord_address' => 'required|max:255',
'orcl_name' => 'required|max:20', //客户姓名
// 'orcl_name' => 'required|max:20', //客户姓名
// 'orcl_phone' => ['sometimes','regex:/^1[3456789]\d{9}$/'],// 客户手机号
// 'orcl_car_num' => 'sometimes|required_if:ord_type,1|max:10',//客户车牌号
// 'orcl_province' => 'required|max:50',
......
app/Services/Business/WashOrderBasicService.php
浏览文件 @ 3b11caaa
......@@ -64,18 +64,16 @@ class WashOrderBasicService extends Service
if ($find_unique) {
return ['code' => ErrorInc::DATA_EXIST, 'msg' => '当前订单已提交，请勿重复操作！', 'data' => ''];
}
if (!isset($request['mem_id']) || empty($request['mem_id'])) {
$request['mem_id'] = $request['ord_client_id'];
}
// 如果有预约时间，则判断是否超出限制预约数量；
if (isset($request['orcl_appoint_time'])) {
// // 如果有预约时间，则判断是否超出限制预约数量；
// if (isset($request['orcl_appoint_time'])) {
$resenum_date=substr($request['orcl_appoint_time'],0,10);
// $resenum_date=substr($request['orcl_appoint_time'],0,10);
$jud_res=WashWorkService::judgmentShopReser($user_info,$resenum_date,'',$request);
// $jud_res=WashWorkService::judgmentShopReser($user_info,$resenum_date,'',$request);
if($jud_res['code'] != 200) return $jud_res;
}
// if($jud_res['code'] != 200) return $jud_res;
// }
// 商品 整理使用会员卡的数据
$goods_data = json_decode($request['goods_data'], true);
if (empty($goods_data)) {
......@@ -179,6 +177,7 @@ class WashOrderBasicService extends Service
->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'];
$data['ord_address_id'] = $request['ord_address_id'];
$data['ord_address_type'] = $request['ord_address_type'];
......@@ -264,70 +263,33 @@ class WashOrderBasicService extends Service
} else {
$weus_id = 0;
}
// 选择的客户id
if ($request['ord_type'] != 0 && empty($request['ord_client_id'])) {
if ($request['ord_type'] == 2) { //买家类型：2企业客户
// 1. 判断企业客户账号名称是否存在
$find_buac = DB::table('business_account')
->where('buac_bucl_id', $request['orcl_business_id'])
->where('buac_name', $request['orcl_name'])
->first(['buac_id']);
if ($find_buac) {
return ['code' => 500, 'msg' => '客户名称已存在，生成订单失败', 'data' => ''];
}
// 2 新增一个企业会员账号
$add_buac_data['buac_shop_id'] = $user_info->adm_shop_id;
$add_buac_data['buac_cid'] = $user_info->adm_cid;
$add_buac_data['buac_name'] = $request['orcl_name'];
$add_buac_data['buac_phone'] = $request['orcl_phone'];
$add_buac_data['buac_bucl_id'] = $request['orcl_business_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');
$buac_res = DB::table('business_account')->insertGetId($add_buac_data);
$request['ord_client_id'] = $buac_res;
//如果有省市区修改
$find_buac_client = DB::table('business_client')
->where('bucl_id', $request['orcl_business_id'])
->first();
if(empty($find_buac_client->bucl_province) && empty($find_buac_client->bucl_city) && empty($find_buac_client->ucl_county) && empty($find_buac_client->bucl_address) && $request['orcl_province'] && $request['orcl_city'] && $request['orcl_county'] && $request['orcl_address']){
$bucl_data['bucl_province'] = isset($request['orcl_province']) ? $request['orcl_province'] : '';//省
$bucl_data['bucl_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';//市
$bucl_data['bucl_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';//区
$bucl_data['bucl_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';//地址
$mem_id = DB::table('business_client')->where('bucl_id', $request['orcl_business_id'])->update($bucl_data);
}
} elseif ($request['ord_type'] == 1) {
if (!empty($request['orcl_phone'])) {//4s店信息
$find_mem = DB::table('member')
->where('mem_cid', $user_info->adm_cid)
->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_phone', $request['orcl_phone'])
->first(['mem_id', 'mem_name', 'mem_4sname']);
if ($find_mem) {
if ($find_mem->mem_4sname == $request['orcl_4sname']) {
$update_mem_data['mem_name'] = isset($request['orcl_name']) ? $request['orcl_name'] : '';
$update_mem_data['mem_4sname'] = isset($request['orcl_4sname']) ? $request['orcl_4sname'] : '';
$update_mem_data['mem_province'] = isset($request['orcl_province']) ? $request['orcl_province'] : '';
$update_mem_data['mem_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';
$update_mem_data['mem_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';
$update_mem_data['mem_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';
$update_mem_res = DB::table('member')->where('mem_id', $find_mem->mem_id)->update($update_mem_data);
}
$request['ord_client_id'] = $find_mem->mem_id;
} else {
$eme['mem_cid'] = $user_info->adm_cid;
$eme['mem_superior_shop_id'] = $user_info->adm_shop_id;
$eme['mem_shop_id'] = $user_info->adm_shop_id;
$eme['mem_create_id'] = $user_info->adm_id;
$eme['mem_create_name'] = $user_info->adm_name;
$eme['mem_name'] = isset($request['orcl_name']) ? $request['orcl_name'] : '';
$eme['mem_4sname'] = isset($request['orcl_4sname']) ? $request['orcl_4sname'] : '';
$eme['mem_bership'] = 2;
$eme['mem_sex'] = 3;
if (!empty($request['orcl_phone'])) {
$find_mem = DB::table('member')
->where('mem_cid', $user_info->adm_cid)
->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_phone', $request['orcl_phone'])
->first(['mem_id']);
if ($find_mem) {
return ["code" => 500, 'msg' => '当前手机号已存在', 'data' => '当前手机号已存在'];
}
}
$mem_fid = 0;
if ($request['mem_fphone']) {
$mem_fid = DB::table('member')
->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_phone', $request['mem_fphone'])
->value('mem_id');
if (!$mem_fid) {
return ['code' => 500, 'msg' => '未查询到该邀请人', 'data' => ''];
}
}
$eme['mem_phone'] = isset($request['orcl_phone']) ? $request['orcl_phone'] : '';
$eme['mem_source'] = isset($request['orcl_mem_source']) ? $request['orcl_mem_source'] : ''; //来源
$eme['mem_car_num'] = isset($request['orcl_car_num']) ? $request['orcl_car_num'] : '';
......@@ -335,119 +297,155 @@ class WashOrderBasicService extends Service
$eme['mem_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';//市
$eme['mem_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';//区
$eme['mem_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';//地址
$eme['mem_fid'] = $mem_fid;//分享人
// $mem_id = DB::table('member')->insertGetId($eme);
$mem_id = MemberService::addMember($eme);
if ($mem_fid) {
$add_data_bind['bilo_shop_id'] = $user_info->adm_shop_id;
$add_data_bind['bilo_Inviter_id'] = $mem_fid;
$add_data_bind['bilo_Invitee_id'] = $mem_id;
$add_data_bind['bilo_state'] = 1;
$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_res = DB::table('bind_log')->insertGetId($add_data_bind);
}
WashOrderService::addFestival($mem_id,$user_info);//新增节日提醒
if (!$mem_id) {
return ['code' => 500, 'msg' => '新增会员失败', 'data' => '新增会员失败'];
}
$request['ord_client_id'] = $mem_id;
if (isset($request['orcl_phone'])) {
if (empty($find_weixin_data)) {
// // 不存在就新增用户
// $weus_data['weus_openid'] = $mem_id;
// $weus_data['weus_phone'] = $request['orcl_phone'];
// $weus_data['weus_nickmame'] = $request['orcl_name'];
// $weus_data['weus_follow'] = 1;
// $weus_data['weus_sex'] = 0;
// $weus_data['weus_province'] = '';
// $weus_data['weus_city'] = '';
// $weus_data['weus_headimgurl'] = '';
// $weus_data['weus_update_time'] = date('Y-m-d H:i:s');
// $weus_id = DB::table('weixin_user')->insertGetId($weus_data);
// if (!$weus_id) {
// return ['code' => 500, 'msg' => '新增失败', 'data' => ''];
// }
$weus_id = false;
// unset($weus_data['weus_update_time']);
} else {
// 更新微信用户信息
$edit_weus['weus_phone'] = $request['orcl_phone'];
$edit_weus['weus_nickmame'] = $request['orcl_name'];
if (!empty($request['weus_headimgurl'])) {
$edit_weus['weus_headimgurl'] = $request['weus_headimgurl'];
}
$edit_weus['weus_update_time'] = date('Y-m-d H:i:s');
$edit_weus_res = DB::table('weixin_user')
->where('weus_id', $find_weixin_data->weus_id)
->update($edit_weus);
unset($edit_weus);
$weus_id = $find_weixin_data->weus_id;
}
} else {
$weus_id = false;
}
// if (isset($request['orcl_phone'])) {
// // 查询微信用户与门店的关系是否存在绑定关系
// $find_user_shop_data = DB::table('user_shop')
// ->where('ussh_weus_id', $weus_id)
// ->where('ussh_shop_id', $user_info->adm_shop_id)
// ->select('ussh_id', 'ussh_user_id', 'ussh_user_type', 'ussh_phone')
// ->first();
// if (empty($find_user_shop_data) && $weus_id) {
// // 用户没有与当前门店绑定，把用户与当前门店绑定
// $ussh_data['ussh_user_id'] = $mem_id;
// $ussh_data['ussh_weus_id'] = $weus_id;
// $ussh_data['ussh_shop_id'] = $user_info->adm_shop_id;
// $ussh_data['ussh_user_type'] = 1;
// $ussh_data['ussh_phone'] = $request['orcl_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_phone'] = $request['orcl_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);
// }
// }
// }
}
}else{
if($request['ord_type'] == 1 && !empty($request['ord_client_id'])){
$find_mem_data = DB::table('member')
->where('mem_cid', $user_info->adm_cid)
->where('mem_shop_id', $user_info->adm_shop_id)
->where('mem_id', $request['ord_client_id'])
->first();
if(empty($find_mem_data->mem_province) && empty($find_mem_data->mem_city) && empty($find_mem_data->mem_county) && empty($find_mem_data->mem_address)){
$eme['mem_province'] = $request['orcl_province']??'';//省
$eme['mem_city'] = $request['orcl_city']??'';//市
$eme['mem_county'] = $request['orcl_county']??'';//区
$eme['mem_address'] = $request['orcl_address']??'';//地址
$mem_id = DB::table('member')->where('mem_id', $request['ord_client_id'])->update($eme);
}
}else if($request['ord_type'] == 2 && isset($request['orcl_business_id']) && !empty($request['orcl_business_id'])){
$find_buac_client = DB::table('business_client')
->where('bucl_id', $request['orcl_business_id'])
->first();
if(empty($find_buac_client->bucl_province) && empty($find_buac_client->bucl_city) && empty($find_buac_client->ucl_county) && empty($find_buac_client->bucl_address) && isset($request['orcl_province']) && $request['orcl_province'] && isset($request['orcl_city']) && $request['orcl_city'] && isset($request['orcl_county']) && $request['orcl_county'] && isset($request['orcl_address']) && $request['orcl_address']){
//如果有省市区修改
$bucl_data['bucl_province'] = isset($request['orcl_province']) ? $request['orcl_province'] : '';//省
$bucl_data['bucl_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';//市
$bucl_data['bucl_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';//区
$bucl_data['bucl_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';//地址
$mem_id = DB::table('business_client')->where('bucl_id', $request['orcl_business_id'])->update($bucl_data);
}
}
}
if (!empty($request['orcl_buac_phone'])) {//保险公司信息
// 1. 判断企业客户账号名称是否存在
$find_buac = DB::table('business_account')
->where('buac_bucl_id', $request['orcl_business_id'])
->where('buac_phone', $request['orcl_buac_phone'])
->first(['buac_id', 'buac_name', 'buac_state']);
if ($find_buac) {
$update_buac_data['buac_name'] = $request['orcl_buac_name'];
$update_buac_data['buac_phone'] = $request['orcl_buac_phone'];
$update_buac_data['buac_state'] = 1;
$buac_res = DB::table('business_account')->where('buac_id', $find_buac->buac_id)->update($update_buac_data);
$request['orcl_buac_id'] = $find_buac->buac_id;
} else {
// 2 新增一个企业会员账号
$add_buac_data['buac_shop_id'] = $user_info->adm_shop_id;
$add_buac_data['buac_cid'] = $user_info->adm_cid;
$add_buac_data['buac_name'] = $request['orcl_buac_name'];
$add_buac_data['buac_phone'] = $request['orcl_buac_phone'];
$add_buac_data['buac_bucl_id'] = $request['orcl_business_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');
$buac_res = DB::table('business_account')->insertGetId($add_buac_data);
$request['orcl_buac_id'] = $buac_res;
}
}
// // 选择的客户id
// if ($request['ord_type'] != 0 && empty($request['ord_client_id'])) {
// if ($request['ord_type'] == 2) { //买家类型：2企业客户
// // 1. 判断企业客户账号名称是否存在
// $find_buac = DB::table('business_account')
// ->where('buac_bucl_id', $request['orcl_business_id'])
// ->where('buac_name', $request['orcl_name'])
// ->first(['buac_id']);
// if ($find_buac) {
// return ['code' => 500, 'msg' => '客户名称已存在，生成订单失败', 'data' => ''];
// }
// // 2 新增一个企业会员账号
// $add_buac_data['buac_shop_id'] = $user_info->adm_shop_id;
// $add_buac_data['buac_cid'] = $user_info->adm_cid;
// $add_buac_data['buac_name'] = $request['orcl_name'];
// $add_buac_data['buac_phone'] = $request['orcl_phone'];
// $add_buac_data['buac_bucl_id'] = $request['orcl_business_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');
// $buac_res = DB::table('business_account')->insertGetId($add_buac_data);
// $request['ord_client_id'] = $buac_res;
// //如果有省市区修改
// $find_buac_client = DB::table('business_client')
// ->where('bucl_id', $request['orcl_business_id'])
// ->first();
// if(empty($find_buac_client->bucl_province) && empty($find_buac_client->bucl_city) && empty($find_buac_client->ucl_county) && empty($find_buac_client->bucl_address) && $request['orcl_province'] && $request['orcl_city'] && $request['orcl_county'] && $request['orcl_address']){
// $bucl_data['bucl_province'] = isset($request['orcl_province']) ? $request['orcl_province'] : '';//省
// $bucl_data['bucl_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';//市
// $bucl_data['bucl_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';//区
// $bucl_data['bucl_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';//地址
// $mem_id = DB::table('business_client')->where('bucl_id', $request['orcl_business_id'])->update($bucl_data);
// }
// } elseif ($request['ord_type'] == 1) {
// $eme['mem_cid'] = $user_info->adm_cid;
// $eme['mem_superior_shop_id'] = $user_info->adm_shop_id;
// $eme['mem_shop_id'] = $user_info->adm_shop_id;
// $eme['mem_create_id'] = $user_info->adm_id;
// $eme['mem_create_name'] = $user_info->adm_name;
// $eme['mem_name'] = isset($request['orcl_name']) ? $request['orcl_name'] : '';
// $eme['mem_bership'] = 2;
// $eme['mem_sex'] = 3;
// if (!empty($request['orcl_phone'])) {
// $find_mem = DB::table('member')
// ->where('mem_cid', $user_info->adm_cid)
// ->where('mem_shop_id', $user_info->adm_shop_id)
// ->where('mem_phone', $request['orcl_phone'])
// ->first(['mem_id']);
// if ($find_mem) {
// return ["code" => 500, 'msg' => '当前手机号已存在', 'data' => '当前手机号已存在'];
// }
// }
// $mem_fid = 0;
// if ($request['mem_fphone']) {
// $mem_fid = DB::table('member')
// ->where('mem_shop_id', $user_info->adm_shop_id)
// ->where('mem_phone', $request['mem_fphone'])
// ->value('mem_id');
// if (!$mem_fid) {
// return ['code' => 500, 'msg' => '未查询到该邀请人', 'data' => ''];
// }
// }
// $eme['mem_phone'] = isset($request['orcl_phone']) ? $request['orcl_phone'] : '';
// $eme['mem_source'] = isset($request['orcl_mem_source']) ? $request['orcl_mem_source'] : ''; //来源
// $eme['mem_car_num'] = isset($request['orcl_car_num']) ? $request['orcl_car_num'] : '';
// $eme['mem_province'] = isset($request['orcl_province']) ? $request['orcl_province'] : '';//省
// $eme['mem_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';//市
// $eme['mem_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';//区
// $eme['mem_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';//地址
// $eme['mem_fid'] = $mem_fid;//分享人
// // $mem_id = DB::table('member')->insertGetId($eme);
// $mem_id = MemberService::addMember($eme);
// if ($mem_fid) {
// $add_data_bind['bilo_shop_id'] = $user_info->adm_shop_id;
// $add_data_bind['bilo_Inviter_id'] = $mem_fid;
// $add_data_bind['bilo_Invitee_id'] = $mem_id;
// $add_data_bind['bilo_state'] = 1;
// $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_res = DB::table('bind_log')->insertGetId($add_data_bind);
// }
// WashOrderService::addFestival($mem_id,$user_info);//新增节日提醒
// if (!$mem_id) {
// return ['code' => 500, 'msg' => '新增会员失败', 'data' => '新增会员失败'];
// }
// $request['ord_client_id'] = $mem_id;
// }
// }else{
// if($request['ord_type'] == 1 && !empty($request['ord_client_id'])){
// $find_mem_data = DB::table('member')
// ->where('mem_cid', $user_info->adm_cid)
// ->where('mem_shop_id', $user_info->adm_shop_id)
// ->where('mem_id', $request['ord_client_id'])
// ->first();
// if(empty($find_mem_data->mem_province) && empty($find_mem_data->mem_city) && empty($find_mem_data->mem_county) && empty($find_mem_data->mem_address)){
// $eme['mem_province'] = $request['orcl_province']??'';//省
// $eme['mem_city'] = $request['orcl_city']??'';//市
// $eme['mem_county'] = $request['orcl_county']??'';//区
// $eme['mem_address'] = $request['orcl_address']??'';//地址
// $mem_id = DB::table('member')->where('mem_id', $request['ord_client_id'])->update($eme);
// }
// }else if($request['ord_type'] == 2 && isset($request['orcl_business_id']) && !empty($request['orcl_business_id'])){
// $find_buac_client = DB::table('business_client')
// ->where('bucl_id', $request['orcl_business_id'])
// ->first();
// if(empty($find_buac_client->bucl_province) && empty($find_buac_client->bucl_city) && empty($find_buac_client->ucl_county) && empty($find_buac_client->bucl_address) && isset($request['orcl_province']) && $request['orcl_province'] && isset($request['orcl_city']) && $request['orcl_city'] && isset($request['orcl_county']) && $request['orcl_county'] && isset($request['orcl_address']) && $request['orcl_address']){
// //如果有省市区修改
// $bucl_data['bucl_province'] = isset($request['orcl_province']) ? $request['orcl_province'] : '';//省
// $bucl_data['bucl_city'] = isset($request['orcl_city']) ? $request['orcl_city'] : '';//市
// $bucl_data['bucl_county'] = isset($request['orcl_county']) ? $request['orcl_county'] : '';//区
// $bucl_data['bucl_address'] = isset($request['orcl_address']) ? $request['orcl_address'] : '';//地址
// $mem_id = DB::table('business_client')->where('bucl_id', $request['orcl_business_id'])->update($bucl_data);
// }
// }
// }
if (!empty($request['orcl_car_num'])) {
$isCarLicense = isCarLicense($request['orcl_car_num']); // 正则判断车牌号格式
......@@ -489,11 +487,15 @@ class WashOrderBasicService extends Service
'orcl_client_id' => isset($request['ord_client_id']) ? $request['ord_client_id'] : 0, //选择客户id
'orcl_sales_adm_id' => isset($request['orcl_sales_adm_id']) ? $request['orcl_sales_adm_id'] : '', // 销售人员id
'orcl_sales_adm_name' => $find_adm ? $find_adm : '', // 销售人员
'orcl_business_id' => isset($request['orcl_business_id']) ? $request['orcl_business_id'] : '', //企业名称
'orcl_business_name' => isset($request['orcl_business_name']) ? $request['orcl_business_name'] : '', //企业名称
'orcl_business_id' => isset($request['orcl_business_id']) ? $request['orcl_business_id'] : '', //企业id
'orcl_name' => isset($request['orcl_name']) ? $request['orcl_name'] : '散户',
'orcl_buac_id' => isset($request['orcl_buac_id']) ? $request['orcl_buac_id'] : '', //定损员id
'orcl_buac_name' => isset($request['orcl_buac_name']) ? $request['orcl_buac_name'] : '', //定损员名称
'orcl_buac_phone' => isset($request['orcl_buac_phone']) ? $request['orcl_buac_phone'] : '', //定损员电话
'orcl_4sname' => isset($request['orcl_4sname']) ? $request['orcl_4sname'] : '',
'orcl_name' => isset($request['orcl_name']) ? $request['orcl_name'] : '',
'orcl_phone' => isset($request['orcl_phone']) ? $request['orcl_phone'] : '',
'orcl_carowner_name' => isset($request['orcl_carowner_name']) ? $request['orcl_carowner_name'] : '散户',
'orcl_carowner_name' => isset($request['orcl_carowner_name']) ? $request['orcl_carowner_name'] : '',
'orcl_carowner_phone' => isset($request['orcl_carowner_phone']) ? $request['orcl_carowner_phone'] : '',
'orcl_car_num' => isset($request['orcl_car_num']) ? $request['orcl_car_num'] : '',
'orcl_pick_up_car_adm_id' => isset($request['orcl_pick_up_car_adm_id']) ? $request['orcl_pick_up_car_adm_id'] : 0, //接车人id
......@@ -1250,7 +1252,7 @@ class WashOrderBasicService extends Service
}
}
if ($request['ord_type'] == 1) {//会员
if ($request['ord_type'] == 1 && $request['ord_client_id']) {//会员
$find_mem = DB::table('member')
->where('mem_id', $request['ord_client_id'])
->select('mem_arrears')
......@@ -1963,17 +1965,17 @@ class WashOrderBasicService extends Service
$wechat_msg_res = $CashierDesk->inforPush($wechat_msg);
}
//如果是智配贴装订单
if ($find_order_data->ord_source == 5) {
$param['serial_number'] = $find_order_data->ord_other_system_number;
$param['time'] = date('Y-m-d H:i:s');
$param['daytime'] = $request['orcl_appoint_time'];
$param['ip'] = Request::getClientIp();
$param['token'] = config('apiconnect.ZPTZ_TOKEN');
$url = config('apiconnect.ZPTZ_URL') . '/index.php/api/supplychain/SupplyMz/addDayTime';
$param_return = doPost($param, $url, 2);
$param_return = json_decode($param_return, true);
}
// //如果是智配贴装订单
// if ($find_order_data->ord_source == 5) {
// $param['serial_number'] = $find_order_data->ord_other_system_number;
// $param['time'] = date('Y-m-d H:i:s');
// $param['daytime'] = $request['orcl_appoint_time'];
// $param['ip'] = Request::getClientIp();
// $param['token'] = config('apiconnect.ZPTZ_TOKEN');
// $url = config('apiconnect.ZPTZ_URL') . '/index.php/api/supplychain/SupplyMz/addDayTime';
// $param_return = doPost($param, $url, 2);
// $param_return = json_decode($param_return, true);
// }
return ['code'=>200, 'msg'=>'success', 'data'=>$return_data];
} else {
......@@ -2741,11 +2743,6 @@ class WashOrderBasicService extends Service
$ord_goods_quantity = $find_dego_order[0]->count + $find_dego_work1[0]->count + $find_dego_work2[0]->count + $find_dego_after[0]->count;//订单待发货数量
$wago_stock_number = $find_warehouse_goods ? $find_warehouse_goods->wago_stock_number : 0;
$goods_num = $storage_goods[0]->count;
// dump($find_dego_order[0]->count);
// dump($find_dego_work1[0]->count);
// dump($find_dego_work2[0]->count);
// dump($find_dego_after[0]->count);
// die;
if ($ord_goods_quantity > $wago_stock_number) {
$state = 2;
......
app/Services/Business/WashOrderService.php
浏览文件 @ 3b11caaa
......@@ -78,7 +78,7 @@ class WashOrderService extends Service
*/
public static function getStatsName($type=false)
{
$status_names = [['type'=>'0','value'=>'全部'],['type'=>'7','value'=>'待接单'],['type'=>'1','value'=>'待派单'],['type'=>'2','value'=>'服务中'],['type'=>'4','value'=>'待评价'],['type'=>'20','value'=>'已完成'],['type'=>'11','value'=>'已取消'],['type'=>'21','value'=>'挂起'],['type'=>'12','value'=>'取消待审核']];
$status_names = [['type'=>'0','value'=>'全部'],['type'=>'7','value'=>'待接单'],['type'=>'1','value'=>'待派单'],['type'=>'2','value'=>'服务中'],['type'=>'4','value'=>'待评价'],['type'=>'20','value'=>'已完成'],['type'=>'11','value'=>'已取消'],['type'=>'21','value'=>'挂起'],['type'=>'12','value'=>'取消待审核'],['type'=>'200','value'=>'退回待派工单'],['type'=>'201','value'=>'待验件'],['type'=>'202','value'=>'施工中'],['type'=>'203','value'=>'施工完成待审核'],['type'=>'204','value'=>'还件'],['type'=>'205','value'=>'完成待核算']];
if($type){
$status_names = array_column($status_names,'value','type');
}
......@@ -123,46 +123,12 @@ class WashOrderService extends Service
$ord_ids = array_column($ord_id, 'ord_id');
$list_data = DB::table('order as ord')
->leftJoin('order_client as orcl', 'orcl.orcl_ord_id', '=', 'ord.ord_id')
->leftJoin('admin as a', 'a.adm_id', '=', 'orcl.orcl_sales_adm_id')
->rightJoin('order_goods as orgo', 'orgo.orgo_ord_id', '=', 'ord.ord_id')
->leftJoin('work_order', 'wor_order_id', '=', 'ord_id')
->where('ord_shop_id', $user_info->adm_shop_id)
->where('ord_collection_bill', 1) //是否代收账单：1正常订单2代收账单
->where('ord_classify', 2) //工单分类：1蓄电池2洗美店3易损件
->where('ord_is_split', '<>', 3) //订单是否拆分，1是2否
->whereNotIn('ord_id', $ord_ids)
->where(function ($query) use ($search_data) { //订单类型搜索
if (!empty($search_data['ord_service_type'])) {
$query->whereIn('ord_service_type', $search_data['ord_service_type']);
if ($search_data['ord_wor_state'] == 2 && isset($search_data['appoint']) && $search_data['appoint'] == 2){//服务中未预约得，不要洗车单
$query->whereIn('ord_service_type', array_diff($search_data['ord_service_type'],[2]));
}
}
if (!empty($search_data['ord_new_type'])) {//订单分类
$query->where('ord_new_type', $search_data['ord_new_type']);
}
if (!empty($search_data['orcl_sales_adm_id'])) {//销售人员搜索
$query->where('orcl_sales_adm_id', $search_data['orcl_sales_adm_id']);
}
if (!empty($search_data['ord_classify'])) {//订单分类：1蓄电池2洗美店3易损件
$query->where('ord_classify', $search_data['ord_classify']);
}
if (!empty($search_data['ord_type'])) {//买家类型：1会员零售2企业客户
$query->where('ord_type', $search_data['ord_type']);
}
if (!empty($search_data['ord_create_id'])) {
$query->where('ord_create_id', $search_data['ord_create_id']);
}
if (!empty($search_data['ord_state'])) {
$query->where('ord_state', $search_data['ord_state']);
}
if (!empty($search_data['ord_source'])) {
$query->where('ord_source', $search_data['ord_source']);
}
})
// ->whereNotIn('ord_id', $ord_ids)
->where(function ($query) use ($search_data) { //关键字搜索
if (!empty($search_data['keywords'])) {
$query->where('orcl_phone', 'like', '%' . $search_data['keywords'] . '%')
......@@ -181,8 +147,18 @@ class WashOrderService extends Service
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_name'])) {
$query->where('orcl_name', 'like', '%' . $search_data['orcl_name'] . '%');
if (!empty($search_data['orcl_business_name'])) {
$query->where('orcl_business_name', 'like', '%' . $search_data['orcl_business_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_buac_name'])) {
$query->where('orcl_buac_name', 'like', '%' . $search_data['orcl_buac_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_buac_phone'])) {
$query->where('orcl_buac_phone', 'like', '%' . $search_data['orcl_buac_phone'] . '%');
}
})
->where(function ($query) use ($search_data) {
......@@ -191,13 +167,13 @@ class WashOrderService extends Service
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_carowner_name'])) {
$query->where('orcl_carowner_name', 'like', '%' . $search_data['orcl_carowner_name'] . '%');
if (!empty($search_data['orcl_name'])) {
$query->where('orcl_name', 'like', '%' . $search_data['orcl_name'] . '%');
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orcl_carowner_phone'])) {
$query->where('orcl_carowner_phone', 'like', '%' . $search_data['orcl_carowner_phone'] . '%');
if (!empty($search_data['orcl_phone'])) {
$query->where('orcl_phone', 'like', '%' . $search_data['orcl_phone'] . '%');
}
})
->where(function ($query) use ($search_data) {
......@@ -206,10 +182,33 @@ class WashOrderService extends Service
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_wor_state']) && !in_array($search_data['ord_wor_state'],[21,22])) {
if (in_array($search_data['ord_wor_state'], [200,201,202,203,204,205])) {
if ($search_data['ord_wor_state'] == 200) {
$query->where('wor_state', 2);
}
if ($search_data['ord_wor_state'] == 201) {
$query->where('wor_state', 5);
}
if ($search_data['ord_wor_state'] == 202) {
$query->where('wor_state', 7);
}
if ($search_data['ord_wor_state'] == 203) {
$query->where('wor_state', 8);
}
if ($search_data['ord_wor_state'] == 204) {
$query->where('wor_state', 9);
}
if ($search_data['ord_wor_state'] == 205) {
$query->where('wor_state', 10);
}
$search_data['ord_wor_state'] = 2;
}
// ord_suspended是否挂起1是2否
if (!empty($search_data['ord_wor_state']) && !in_array($search_data['ord_wor_state'],[21,22,])) {
$query->where('ord_wor_state', $search_data['ord_wor_state'])
->where('ord_suspended', 2);
} elseif (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] == 21) {
// 挂起
$query->whereIn('ord_wor_state', [4,20])
->where('ord_suspended', 2);
} elseif (!empty($search_data['ord_wor_state']) && $search_data['ord_wor_state'] == 22) {
......@@ -220,12 +219,13 @@ class WashOrderService extends Service
}
})
->where(function ($query) use ($search_data) {
if (isset($search_data['ord_payment_way'])) {
if (!empty($search_data['ord_payment_way'])) {
$query->where('ord_payment_way', $search_data['ord_payment_way']);
} elseif ($search_data['ord_payment_way'] ===0) {
$query->where('ord_payment_way', $search_data['ord_payment_way']);
}
if (!empty($search_data['ord_payment_way'])) {
$query->where('ord_payment_way', $search_data['ord_payment_way']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_state'])) {
$query->where('ord_state', $search_data['ord_state']);
}
})
->where(function ($query) use ($search_data) { //创建时间
......@@ -244,34 +244,6 @@ class WashOrderService extends Service
}
}
})
->where(function ($query) use ($search_data) { //预约时间
// 如果选择开始时间并且选择结束时间
if (!empty($search_data['appoint_time_start']) && !empty($search_data['appoint_time_end'])) {
$query->whereBetween('orcl_appoint_time', [$search_data['appoint_time_start'], $search_data['appoint_time_end'] . ' 23:59:59']);
} else {
// 如果选择开始时间
if (!empty($search_data['appoint_time_start'])) {
$query->where('orcl_appoint_time', '>=', $search_data['appoint_time_start']);
} else {
// 如果选择结束时间
if (!empty($search_data['appoint_time_end'])) {
$query->where('orcl_appoint_time', '<=', $search_data['appoint_time_end'] . ' 23:59:59');
}
}
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_client_id'])) {
$query->where('ord_client_id', $search_data['ord_client_id']);
}
})
->where(function ($query) use ($type,$search_data,$user_info) {
if ($type == 2) {
if ($search_data['search_all'] != 1) {
$query->where('orcl_sales_adm_id', $user_info->adm_id);
}
}
})
->where(function ($query) use ($search_data) { //实际金额区间搜索
// 如果选择最小钱数并且选择最大钱数
if (!empty($search_data['min_price']) && !empty($search_data['max_price'])) {
......@@ -288,30 +260,14 @@ class WashOrderService extends Service
}
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['ord_address_type']) && !empty($search_data['ord_address_id'])) {
$query->where('ord_address_type', $search_data['ord_address_type'])
->where('ord_address_id', $search_data['ord_address_id']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orgo_goo_name'])) {
$query->where('orgo_goo_name', $search_data['orgo_goo_name']);
}
})
->where(function ($query) use ($search_data) {
if (!empty($search_data['orgo_goo_goods_encode'])) {
$query->where('orgo_goo_type', 3)
->where('orgo_goo_goods_encode', $search_data['orgo_goo_goods_encode']);
}
})
->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')
->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')
->orderByRaw("FIELD(ord_wor_state, 11)")
->orderBy('ord_id', $orderby_type)
->groupBy('ord_id')
->paginate($show_count);
$list_items = $list_data->items();
$all_status = self::getStatsName(true);
if ($list_items) {
$ord_source = array_column($ord_source_enum, 'state_show', 'state');
......@@ -366,6 +322,11 @@ class WashOrderService extends Service
$typeName = WashOrderService::getPaymentWayName(true);//获取支付方式名称
foreach ($list_items as $key => $value) {
$work_order = DB::table('work_order')
->where('wor_order_id', $value->ord_id)
->select('wor_id')
->first();
$list_items[$key]->wor_id = $work_order ? $work_order->wor_id : '';
if (empty($value->ord_new_type)) {
$updata_type['ord_new_type'] = DB::table('order_type')
->where('orty_shop_id', $user_info->adm_shop_id)
......@@ -492,7 +453,37 @@ class WashOrderService extends Service
$list_items[$key]->orcl_carowner_name = mb_substr($value->orcl_carowner_name,0,1,'utf-8').str_repeat("*",(strlen($value->orcl_carowner_name)/2-1));
$list_items[$key]->orcl_name = mb_substr($value->orcl_name,0,1,'utf-8').str_repeat("*",(strlen($value->orcl_name)/2-1));
}
$status_name = $all_status[$value->ord_wor_state]??'';
$wor_state = DB::table('work_order')
->where('wor_order_id',$value->ord_id)
->value('wor_state');
if ($value->ord_wor_state == 2) {
switch ($wor_state) {
case 2:
$new_ord_wor_state = 200;
break;
case 5:
$new_ord_wor_state = 201;
break;
case 7:
$new_ord_wor_state = 202;
break;
case 8:
$new_ord_wor_state = 203;
break;
case 9:
$new_ord_wor_state = 204;
break;
case 10:
$new_ord_wor_state = 205;
break;
default:
$new_ord_wor_state = 200;
break;
}
} else {
$new_ord_wor_state = $value->ord_wor_state;
}
$status_name = $all_status[$new_ord_wor_state]??'';
$list_items[$key]->ord_wor_state_name = $status_name;
if ($value->ord_suspended == 1) {
$list_items[$key]->ord_wor_state_name = '已挂起';
......@@ -592,6 +583,15 @@ class WashOrderService extends Service
if ($value_b['pri_id'] == 727) {//查看凭证
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 887) {//再来一单
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 888 && $value->ord_wor_state == 2 && $wor_state == 2) {//重新派单工单
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 889 && $value->ord_wor_state == 2 && $wor_state == 2) {//取消工单
$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_b['pri_id'] == 593) {
$list_items[$key]->list_button_two[] = $value_b;
......@@ -600,9 +600,9 @@ class WashOrderService extends Service
$work_order = DB::table('work_order')
->where('wor_order_id',$value->ord_id)
->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])) {
$list_items[$key]->list_button_two[] = $value_b;
}
// 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;
// }
if ($value->ord_wor_state == 1 && $value_b['pri_id'] == 589 && $value->ord_source != 5) {//编辑
$list_items[$key]->list_button_two[] = $value_b;
}
......@@ -744,17 +744,17 @@ class WashOrderService extends Service
$data['current_number'] = $show_count; //一页显示多少个
$data['data'] = $list_items; //返回数据
$data['order_goods'] = $order_goods; //订单商品数据
$data['state_count'] = $state_count;
// $data['state_count'] = $state_count;
$data['order_log'] = $order_log; //操作记录
$data['order_reamrks'] = $order_reamrks; //订单备注
$data['ord_source_enum'] = $ord_source_enum; //订单来源
$data['now_time'] = date('Y-m-d H:i:s'); //当前时间
$wheres['ord_shop_id'] = $user_info->adm_shop_id;
$wheres['ord_classify'] = 2;
$wheres['ord_collection_bill'] = 1;
$wheres['ord_is_split_noteq'] = 3;
$wheres['ord_id_notin'] = $ord_ids;
$wheres['ord_service_type_searchin'] = $search_data['ord_service_type'];
// $wheres['ord_classify'] = 2;
// $wheres['ord_collection_bill'] = 1;
// $wheres['ord_is_split_noteq'] = 3;
// $wheres['ord_id_notin'] = $ord_ids;
// $wheres['ord_service_type_searchin'] = $search_data['ord_service_type'];
$data['showcount'] = self::getStatusBar($wheres, $user_info);
// if (empty($no_appoint_count)) {
// $data['showcount'][3]['shownum'] = 0;
......@@ -777,7 +777,12 @@ class WashOrderService extends Service
// ['showname' => "待接单", 'shownum' => '0','ord_wor_state'=>7],
['showname' => "待派单", 'shownum' => '0','ord_wor_state'=>1],
// ['showname' => "未预约", 'shownum' => '0','ord_wor_state'=>2,'appoint'=>2],
['showname' => "服务中", 'shownum' => '0','ord_wor_state'=>2],
['showname' => "退回待派工单", 'shownum' => '0','ord_wor_state'=>200],
['showname' => "待验件", 'shownum' => '0','ord_wor_state'=>201],
['showname' => "施工中", 'shownum' => '0','ord_wor_state'=>202],
['showname' => "维修完成待审核", 'shownum' => '0','ord_wor_state'=>203],
['showname' => "还件", 'shownum' => '0','ord_wor_state'=>204],
['showname' => "完成待核算", 'shownum' => '0','ord_wor_state'=>205],
// ['showname' => "待评价", 'shownum' => '0','ord_wor_state'=>4],
['showname' => "已取消", 'shownum' => '0','ord_wor_state'=>11],
['showname' => "已完成", 'shownum' => '0','ord_wor_state'=>20],
......@@ -806,9 +811,41 @@ class WashOrderService extends Service
public static function getStatusNum ( $status,$where){
if($status > 0){
$db = new WashOrder();
$where['ord_wor_state'] = $status;
if (in_array($status,[200,201,202,203,204,205])) {
$where['ord_wor_state'] = 2;
switch ($status) {
case 200:
$where['wor_state'] = 2;
break;
case 201:
$where['wor_state'] = 5;
break;
case 202:
$where['wor_state'] = 7;
break;
case 203:
$where['wor_state'] = 8;
break;
case 204:
$where['wor_state'] = 9;
break;
case 205:
$where['wor_state'] = 10;
break;
default:
$where['wor_state'] = 5;
break;
}
$where['ord_wor_state'] = 2;
} else {
$where['ord_wor_state'] = $status;
}
$where['ord_suspended'] = 2;
$num = CommonService::getMysqlData($db,$where,[],[],'count');
$num = DB::table('order')
->leftJoin('work_order', 'wor_order_id', '=', 'ord_id')
->where($where)
->count();
// $num = CommonService::getMysqlData($db,$where,[],[],'count');
$num = $num??'0';
return $num;
}else{
......@@ -869,7 +906,7 @@ class WashOrderService extends Service
$query->where('ord_wor_state', $search_data['ord_wor_state']);
}
})
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_order_price', 'ord_actual_price', 'ord_type', 'ord_order_state', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_remark', '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', 'shop_store_name', 'orcl_car_vin', 'shop_province', 'shop_city', 'shop_county', 'shop_address', 'orcl_car_brand_series', 'orcl_carowner_phone', 'orcl_carowner_name', 'orcl_carbrse_type','ord_source','ord_payment_way','ord_zero_price','ord_service_type', 'ord_add_type') //列表增加 来源 和 支付方式 等字段
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_order_price', 'ord_actual_price', 'ord_type', 'ord_order_state', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_delete', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_remark', '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', 'shop_store_name', 'orcl_car_vin', 'shop_province', 'shop_city', 'shop_county', 'shop_address', 'orcl_car_brand_series', 'orcl_carowner_phone', 'orcl_carowner_name', 'orcl_carbrse_type','ord_source','ord_payment_way','ord_zero_price','ord_service_type', 'ord_add_type', 'orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname') //列表增加 来源 和 支付方式 等字段
->orderBy('ord_create_time', $orderby_type)
->paginate($show_count);
$list_items = $list_data->items();
......@@ -882,14 +919,14 @@ class WashOrderService extends Service
$list_items[$key]->pay_price=$val->ord_order_price-$val->ord_zero_price;
// 优惠金额等于抹零金额
$list_items[$key]->discount_price=$val->ord_zero_price;
if ($val->ord_payment_way == 5) {
$list_items[$key]->myvi_name = DB::table('vip_card_record as vcre')
->leftJoin('myvip as m', 'm.myvi_id', '=', 'vcre.vcre_myvi_id')
->where('vcre_ord_id', $val->ord_id)
->value('myvi_name');
} else {
$list_items[$key]->myvi_name = '';
}
// if ($val->ord_payment_way == 5) {
// $list_items[$key]->myvi_name = DB::table('vip_card_record as vcre')
// ->leftJoin('myvip as m', 'm.myvi_id', '=', 'vcre.vcre_myvi_id')
// ->where('vcre_ord_id', $val->ord_id)
// ->value('myvi_name');
// } else {
// $list_items[$key]->myvi_name = '';
// }
if($val->ord_source == 2){
$else_ordid[]=$val->ord_id;
}
......@@ -2655,7 +2692,7 @@ class WashOrderService extends Service
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->where('ord_id', $request['ord_id'])
->where('ord_shop_id', $user_info->adm_shop_id)
->select('ord_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_payment_way', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_remark', '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_car_brand_series', 'ord_create_id', 'ord_ware_id', 'orcl_sales_adm_id', 'ord_is_split', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain', 'orcl_mem_source', 'orcl_business_id', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type', 'ord_add_work_state', 'ord_other_payway', 'ord_wor_state', 'ord_new_type')
->select('ord_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_payment_way', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_remark', '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_car_brand_series', 'ord_create_id', 'ord_ware_id', 'orcl_sales_adm_id', 'ord_is_split', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain', 'orcl_mem_source', 'orcl_business_id', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type', 'ord_add_work_state', 'ord_other_payway', 'ord_wor_state', 'ord_new_type', 'orcl_business_name', 'orcl_business_id', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'ord_other_system_number')
->first();
if (empty($info)) {
return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>''];
......@@ -2760,14 +2797,18 @@ class WashOrderService extends Service
// 添加订单客户表数据
$orcl_data = [
'orcl_client_id' => isset($request['ord_client_id']) ? $request['ord_client_id'] : 0, //选择客户id
'orcl_buac_id' => isset($request['orcl_buac_id']) ? $request['orcl_buac_id'] : 0, //定险员
'orcl_buac_name' => isset($request['orcl_buac_name']) ? $request['orcl_buac_name'] : 0, //定险员
'orcl_buac_phone' => isset($request['orcl_buac_phone']) ? $request['orcl_buac_phone'] : 0, //定险员电话
'orcl_4sname' => isset($request['orcl_4sname']) ? $request['orcl_4sname'] : 0, //4s店名
'orcl_sales_adm_id' => isset($request['orcl_sales_adm_id']) ? $request['orcl_sales_adm_id'] : '',// 销售人员id
'orcl_sales_adm_name' => $orcl_sales_adm_name,// 销售人员
'orcl_business_name' => isset($request['orcl_business_name']) ? $request['orcl_business_name'] : '',//企业名称
'orcl_business_id' => isset($request['orcl_business_id']) ? $request['orcl_business_id'] : '',//企业id
'orcl_name' => $request['orcl_name'],//客户姓名
'orcl_phone' => $request['orcl_phone'],//客户电话
'orcl_carowner_name' => $request['orcl_carowner_name'],//车主姓名
'orcl_carowner_phone' => $request['orcl_carowner_phone'],//车主电话
// 'orcl_carowner_name' => $request['orcl_carowner_name'],//车主姓名
// 'orcl_carowner_phone' => $request['orcl_carowner_phone'],//车主电话
'orcl_mem_source' => $request['orcl_mem_source'],//车主电话
'orcl_car_num' => isset($request['orcl_car_num']) ? $request['orcl_car_num'] : '',
'orcl_pick_up_car_adm_id' => isset($request['orcl_pick_up_car_adm_id']) ? $request['orcl_pick_up_car_adm_id'] : 0, //接车人id
......@@ -2804,18 +2845,18 @@ class WashOrderService extends Service
return $return_car_data;
}
// 预约时间
if (isset($request['orcl_appoint_time'])) {
$orcl_data['orcl_appoint_time'] = $request['orcl_appoint_time'];
// if (isset($request['orcl_appoint_time'])) {
// $orcl_data['orcl_appoint_time'] = $request['orcl_appoint_time'];
$resenum_date=date('Y-m-d', strtotime($request['orcl_appoint_time']));
$request['ord_new_type'] = $order_data->ord_new_type;
$jud_res=WashWorkService::judgmentShopReser($user_info,$resenum_date,$order_data->orcl_appoint_time,$request);
// $resenum_date=date('Y-m-d', strtotime($request['orcl_appoint_time']));
// $request['ord_new_type'] = $order_data->ord_new_type;
// $jud_res=WashWorkService::judgmentShopReser($user_info,$resenum_date,$order_data->orcl_appoint_time,$request);
if($jud_res['code'] != 200) return $jud_res;
// if($jud_res['code'] != 200) return $jud_res;
} else {
$orcl_data['orcl_appoint_time'] = '0000-00-00 00:00:00';
}
// } else {
// $orcl_data['orcl_appoint_time'] = '0000-00-00 00:00:00';
// }
// 选择的客户id，对应的订单数量增加
if ($request['ord_client_id']) {
if ($request['ord_type'] == 1) { //买家类型：1会员零售
......@@ -2877,67 +2918,6 @@ class WashOrderService extends Service
}
$request['ord_client_id'] = $mem_id;
$client_res = true;
if (empty($find_weixin_data)) {
// 不存在就新增用户
$weus_data['weus_openid'] = $mem_id;
$weus_data['weus_phone'] = $request['orcl_phone'];
$weus_data['weus_nickmame'] = $request['orcl_name'];
$weus_data['weus_follow'] = 1;
$weus_data['weus_sex'] = 0;
$weus_data['weus_province'] = '';
$weus_data['weus_city'] = '';
$weus_data['weus_headimgurl'] = '';
$weus_data['weus_update_time'] = date('Y-m-d H:i:s');
$weus_id = DB::table('weixin_user')->insertGetId($weus_data);
if (!$weus_id) {
return ['code'=>500, 'msg'=>'新增失败', 'data'=>''];
}
unset($weus_data['weus_update_time']);
} else {
// 更新微信用户信息
$edit_weus['weus_phone'] = $request['orcl_phone'];
$edit_weus['weus_nickmame'] = $request['orcl_name'];
if (!empty($request['weus_headimgurl'])) {
$edit_weus['weus_headimgurl'] = $request['weus_headimgurl'];
}
$edit_weus['weus_update_time'] = date('Y-m-d H:i:s');
$edit_weus_res = DB::table('weixin_user')
->where('weus_id', $find_weixin_data->weus_id)
->update($edit_weus);
unset($edit_weus);
$weus_id = $find_weixin_data->weus_id;
}
// 查询微信用户与门店的关系是否存在绑定关系
$find_user_shop_data = DB::table('user_shop')
->where('ussh_weus_id', $weus_id)
->where('ussh_shop_id', $user_info->adm_shop_id)
->select('ussh_id', 'ussh_user_id', 'ussh_user_type', 'ussh_phone')
->first();
if (empty($find_user_shop_data)) {
// 用户没有与当前门店绑定，把用户与当前门店绑定
$ussh_data['ussh_user_id'] = $mem_id;
$ussh_data['ussh_weus_id'] = $weus_id;
$ussh_data['ussh_shop_id'] = $user_info->adm_shop_id;
$ussh_data['ussh_user_type'] = 1;
$ussh_data['ussh_phone'] = $request['orcl_phone'];
$ussh_data['ussh_create_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_phone'] = $request['orcl_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);
}
}
}
}
$orcl_id = DB::table('order_client')
......@@ -3323,70 +3303,70 @@ class WashOrderService extends Service
if ($request['ord_add_work_state'] == 2) {
// 买家类型：1门店零售2客户单位(企业客户)3速电派单4第三方派单5运营中心给门店派单
// 判断是否为散户，ord_type为空值，是散户
if (empty($request['ord_type'])) {
// 散户开单流程
$order_datas['data']['ord_order_number'] = $order_data->ord_order_number;
$order_datas['data']['ord_id'] = $request['ord_id'];
$order_datas['data']['shop_id'] = $user_info->adm_shop_id;
$order_datas['data']['ord_type'] = 0;
$order_datas['data']['ord_client_id'] = $request['ord_client_id'];
if ($request['ware_id'] && $is_goods) {//选择仓库并且选择产品
$ord_edit_data['ord_wor_state'] = 2;//服务中
$request['service_shop_id'] = $user_info->adm_shop_id;
$dibi_data = DispatchBill::create(
$user_info, //用户信息
$request, //订单提交数据
$new_goods_data, //提交的商品数据
1, //类型：1.订单发货 2.工单发货
$request['ware_id'], //出库仓库id
$order_datas['data']['ord_order_number'], //原始单号，订单号/工单号
$order_datas['data']['ord_id'], //发货单关联的工单/订单id
$order_datas['data']['shop_id'], //所属总店id
$order_datas['data']['ord_type'], //买家类型：1.会员零售2.客户单位3.速电派单4.第三方派单
$order_datas['data']['ord_client_id'], //选择的客户id,会员id/单位id
$new_goo_all_quantity //发货总数量
);
if ($dibi_data['code'] == 500) {
return $dibi_data;
}
} else {
$ord_edit_data['ord_wor_state'] = 20;//已完成
}
} else {
// 不是散户，未选择产品或未选择仓库，生成订单，订单状态为待评价状态
// 不是散户，选择产品并且选择仓库，生成订单，订单状态是服务中，生成发货单
$order_datas['data']['ord_order_number'] = $order_data->ord_order_number;
$order_datas['data']['ord_id'] = $request['ord_id'];
$order_datas['data']['shop_id'] = $user_info->adm_shop_id;
$order_datas['data']['ord_type'] = $request['ord_type'];
$order_datas['data']['ord_client_id'] = $request['ord_client_id'];
if ($request['ware_id'] && $is_goods) {//选择仓库并且选择产品
$ord_edit_data['ord_wor_state'] = 2;//服务中
$request['service_shop_id'] = $user_info->adm_shop_id;
$dibi_data = DispatchBill::create(
$user_info, //用户信息
$request, //订单提交数据
$new_goods_data, //提交的商品数据
1, //类型：1.订单发货 2.工单发货
$request['ware_id'], //出库仓库id
$order_datas['data']['ord_order_number'], //原始单号，订单号/工单号
$order_datas['data']['ord_id'], //发货单关联的工单/订单id
$order_datas['data']['shop_id'], //所属总店id
$order_datas['data']['ord_type'], //买家类型：1.会员零售2.客户单位3.速电派单4.第三方派单
$order_datas['data']['ord_client_id'], //选择的客户id,会员id/单位id
$new_goo_all_quantity //发货总数量
);
if ($dibi_data['code'] == 500) {
return $dibi_data;
}
} else {
$ord_edit_data['ord_wor_state'] = 4;//待评价
if (empty($request['orcl_phone'])) {
$ord_edit_data['ord_wor_state'] = 20;//已完成
}
// if (empty($request['ord_type'])) {
// // 散户开单流程
// $order_datas['data']['ord_order_number'] = $order_data->ord_order_number;
// $order_datas['data']['ord_id'] = $request['ord_id'];
// $order_datas['data']['shop_id'] = $user_info->adm_shop_id;
// $order_datas['data']['ord_type'] = 0;
// $order_datas['data']['ord_client_id'] = $request['ord_client_id'];
// if ($request['ware_id'] && $is_goods) {//选择仓库并且选择产品
// // $ord_edit_data['ord_wor_state'] = 2;//服务中
// // $request['service_shop_id'] = $user_info->adm_shop_id;
// // $dibi_data = DispatchBill::create(
// // $user_info, //用户信息
// // $request, //订单提交数据
// // $new_goods_data, //提交的商品数据
// // 1, //类型：1.订单发货 2.工单发货
// // $request['ware_id'], //出库仓库id
// // $order_datas['data']['ord_order_number'], //原始单号，订单号/工单号
// // $order_datas['data']['ord_id'], //发货单关联的工单/订单id
// // $order_datas['data']['shop_id'], //所属总店id
// // $order_datas['data']['ord_type'], //买家类型：1.会员零售2.客户单位3.速电派单4.第三方派单
// // $order_datas['data']['ord_client_id'], //选择的客户id,会员id/单位id
// // $new_goo_all_quantity //发货总数量
// // );
// // if ($dibi_data['code'] == 500) {
// // return $dibi_data;
// // }
// } else {
// // $ord_edit_data['ord_wor_state'] = 20;//已完成
// }
// } else {
// // 不是散户，未选择产品或未选择仓库，生成订单，订单状态为待评价状态
// // 不是散户，选择产品并且选择仓库，生成订单，订单状态是服务中，生成发货单
// $order_datas['data']['ord_order_number'] = $order_data->ord_order_number;
// $order_datas['data']['ord_id'] = $request['ord_id'];
// $order_datas['data']['shop_id'] = $user_info->adm_shop_id;
// $order_datas['data']['ord_type'] = $request['ord_type'];
// $order_datas['data']['ord_client_id'] = $request['ord_client_id'];
// if ($request['ware_id'] && $is_goods) {//选择仓库并且选择产品
// $ord_edit_data['ord_wor_state'] = 2;//服务中
// $request['service_shop_id'] = $user_info->adm_shop_id;
// $dibi_data = DispatchBill::create(
// $user_info, //用户信息
// $request, //订单提交数据
// $new_goods_data, //提交的商品数据
// 1, //类型：1.订单发货 2.工单发货
// $request['ware_id'], //出库仓库id
// $order_datas['data']['ord_order_number'], //原始单号，订单号/工单号
// $order_datas['data']['ord_id'], //发货单关联的工单/订单id
// $order_datas['data']['shop_id'], //所属总店id
// $order_datas['data']['ord_type'], //买家类型：1.会员零售2.客户单位3.速电派单4.第三方派单
// $order_datas['data']['ord_client_id'], //选择的客户id,会员id/单位id
// $new_goo_all_quantity //发货总数量
// );
// if ($dibi_data['code'] == 500) {
// return $dibi_data;
// }
// } else {
// $ord_edit_data['ord_wor_state'] = 4;//待评价
// if (empty($request['orcl_phone'])) {
// $ord_edit_data['ord_wor_state'] = 20;//已完成
// }
}
}
// }
// }
}
// 4. 更改订单表客户id、订单金额
......@@ -4243,9 +4223,8 @@ class WashOrderService extends Service
$info = DB::table('order as ord')
->leftJoin('shop as s', 's.shop_id', '=', 'ord.ord_shop_id')
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->leftJoin('warehouse as w', 'w.ware_id', '=', 'ord.ord_ware_id')
->where('ord_id', $request['ord_id'])
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_mem_price', 'ord_payment_way', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_remark', 'ord_create_time', 'ord_order_price', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'orcl_sales_adm_id', 'shop_province', 'shop_city', 'shop_county', 'shop_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'ord_explain', 'orcl_mem_source', 'ord_address_id', 'ord_address_type', 'orcl_business_name', 'orcl_business_id', 'shop_store_name', 'ord_service_type', 'ord_settlement_time', 'orcl_carbrse_type', 'ord_shop_id', 'ord_cancel_reason', 'ord_service_adm_id', 'ord_ware_id', 'ware_name','ord_zero_price','ord_pay_state', 'ord_source', 'ord_other_system_number', 'orcl_cus_msg', 'ord_other_payway', 'ord_payment_money', 'ord_banlance','orcl_province','orcl_city','orcl_county','orcl_address', 'ord_points','ord_add_type', 'ord_new_type', 'ord_openbill', 'ord_openbill_number', 'ord_openbill_image')
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_mem_price', 'ord_payment_way', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_remark', 'ord_create_time', 'ord_order_price', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'orcl_sales_adm_id', 'shop_province', 'shop_city', 'shop_county', 'shop_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'ord_explain', 'orcl_mem_source', 'ord_address_id', 'ord_address_type', 'orcl_business_name', 'orcl_business_id', 'shop_store_name', 'ord_service_type', 'ord_settlement_time', 'orcl_carbrse_type', 'ord_shop_id', 'ord_cancel_reason', 'ord_service_adm_id', 'ord_ware_id','ord_zero_price','ord_pay_state', 'ord_source', 'ord_other_system_number', 'orcl_cus_msg', 'ord_other_payway', 'ord_payment_money', 'ord_banlance','orcl_province','orcl_city','orcl_county','orcl_address', 'ord_points','ord_add_type', 'ord_new_type', 'ord_openbill', 'ord_openbill_number', 'ord_openbill_image', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'orcl_buac_id')
->first();
if (empty($info)) {
return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在1', 'data'=>''];
......@@ -4302,8 +4281,37 @@ class WashOrderService extends Service
$info->orcl_phone = substr_replace($info->orcl_phone,'****',3,4);
}
$all_status = self::getStatsName(true);
$status_name = $all_status[$info->ord_wor_state]??'';
if($info->ord_wor_state == 2 && $info->orcl_appoint_time == '0000-00-00 00:00:00'){$status_name = '未预约';}
$wor_state = DB::table('work_order')
->where('wor_order_id',$info->ord_id)
->value('wor_state');
if ($info->ord_wor_state == 2) {
switch ($wor_state) {
case 2:
$new_ord_wor_state = 200;
break;
case 5:
$new_ord_wor_state = 201;
break;
case 7:
$new_ord_wor_state = 202;
break;
case 8:
$new_ord_wor_state = 203;
break;
case 9:
$new_ord_wor_state = 204;
break;
case 10:
$new_ord_wor_state = 205;
break;
default:
$new_ord_wor_state = 200;
break;
}
} else {
$new_ord_wor_state = $info->ord_wor_state;
}
$status_name = $all_status[$new_ord_wor_state]??'';
$info->ord_wor_state_name = $status_name;
$order = new OrderEnum();
// 获取枚举数据
......@@ -4466,7 +4474,7 @@ class WashOrderService extends Service
public static function getPaymentWayName($type=false){
$user_info = LoginUserService::getUser();
// 结算方式1.现金2.支付宝 3微信 4银行卡5会员卡
$data = [['type'=>0,'name'=>'暂不结算'],['type'=>1,'name'=>'现金'],['type'=>2,'name'=>'支付宝'],['type'=>3,'name'=>'微信'],['type'=>4,'name'=>'银行卡'],['type'=>8,'name'=>'账期'],['type'=>9,'name'=>'部分结款']];
$data = [['type'=>0,'name'=>'暂不结算'],['type'=>1,'name'=>'结算'],['type'=>9,'name'=>'部分结款']];
if($type){
$data = array_column($data, 'name','type');
}
......@@ -7803,7 +7811,7 @@ class WashOrderService extends Service
}
}
}
$ord_edit_data['ord_order_price'] = $all_price;//订单金额
// $ord_edit_data['ord_order_price'] = $all_price;//订单金额
$mem_price = WashOrderBasicService::mem_price(['ord_type'=>$find_order_data->ord_type,'ord_client_id'=>$find_order_data->ord_client_id],$user_info);
if($mem_price['code'] == 200){
$mem_points_multiple = $mem_price['data']['meml_points_multiple'];
......@@ -10705,12 +10713,12 @@ class WashOrderService extends Service
public static function getPayWay() {
return [
['type'=>0,'name'=>'暂不结算'],
['type'=>1,'name'=>'现金'],
['type'=>2,'name'=>'支付宝'],
['type'=>3,'name'=>'微信'],
['type'=>4,'name'=>'银行卡'],
['type'=>6,'name'=>'余额'],
['type'=>7,'name'=>'他人代付'],
// ['type'=>1,'name'=>'现金'],
// ['type'=>2,'name'=>'支付宝'],
// ['type'=>3,'name'=>'微信'],
['type'=>4,'name'=>'结算'],
// ['type'=>6,'name'=>'余额'],
// ['type'=>7,'name'=>'他人代付'],
['type'=>9,'name'=>'部分结款'],
];
}
......
app/Services/Operation/BusinessService.php
浏览文件 @ 3b11caaa
......@@ -146,7 +146,7 @@ class BusinessService extends Service
foreach ($list_items as $key => $value) {
// 创建人
if ($value->buac_create_adm_id) {
$list_items[$key]->buac_create_adm_name = $find_adm[$value->buac_create_adm_id];
$list_items[$key]->buac_create_adm_name = isset($find_adm[$value->buac_create_adm_id]) ? $find_adm[$value->buac_create_adm_id]:'';
} else {
$list_items[$key]->buac_create_adm_name = '';
}
......@@ -237,8 +237,8 @@ class BusinessService extends Service
$data['bucl_create_id'] = $user_info->adm_id;
$data['bucl_update_id'] = $user_info->adm_id;
$data['bucl_name'] = $request['bucl_name']; //企业客户名称
$data['bucl_user_phone'] = $request['bucl_user_phone']; //联系人电话
$data['bucl_user_name'] = $request['bucl_user_name']; //联系人名称
$data['bucl_user_phone'] = $request['bucl_user_phone']??''; //联系人电话
$data['bucl_user_name'] = $request['bucl_user_name']??''; //联系人名称
$data['bucl_create_time'] = date('Y-m-d H:i:s');
$data['bucl_update_time'] = date('Y-m-d H:i:s');
$data['bucl_province'] = isset($request['bucl_province']) ? $request['bucl_province'] : ''; //省
......@@ -302,15 +302,17 @@ class BusinessService extends Service
}
$bucl_id = Business::insertGetId($data);
$password = md5('123456' . 'faster123456');
$new_data['buac_cid'] = $user_info->adm_cid;
$new_data['buac_shop_id'] = $user_info->adm_shop_id;
$new_data['buac_create_adm_id'] = $user_info->adm_id;
$new_data['buac_bucl_id'] = $bucl_id; //企业客户id
$new_data['buac_name'] = $request['bucl_user_name']; //企业客户名称
$new_data['buac_phone'] = $request['bucl_user_phone']; //联系人电话
$new_data['buac_password'] = $password; //密码
$new_data['buac_create_time'] = date('Y-m-d H:i:s');
DB::table('business_account')->insertGetId($new_data);
if ($request['bucl_user_name'] || $request['bucl_user_phone']) {
$new_data['buac_cid'] = $user_info->adm_cid;
$new_data['buac_shop_id'] = $user_info->adm_shop_id;
$new_data['buac_create_adm_id'] = $user_info->adm_id;
$new_data['buac_bucl_id'] = $bucl_id; //企业客户id
$new_data['buac_name'] = $request['bucl_user_name']??''; //企业客户名称
$new_data['buac_phone'] = $request['bucl_user_phone']??''; //联系人电话
$new_data['buac_password'] = $password; //密码
$new_data['buac_create_time'] = date('Y-m-d H:i:s');
DB::table('business_account')->insertGetId($new_data);
}
return $bucl_id;
}
......@@ -476,4 +478,14 @@ class BusinessService extends Service
return $data;
}
/**
* 修改保险公司员工停启用
*/
public static function editAccState($request){
$data['buac_state'] = $request['state'];
$data['buac_update_time'] = date('Y-m-d H:i:s');
$res = DB::table('business_account')->where('buac_id', $request['buac_id'])->update($data);
return $res;
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论