Skip to content

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

维修项目修改20260228

上级 0433cf01
显示空白字符变更
内嵌 并排
正在显示 包含 150 行增加 和 37 行删除
app/Http/Controllers/WeChatApplet/Technician/MemberController.php
浏览文件 @ 2d440fc8
...@@ -194,4 +194,26 @@ class MemberController extends Controller ...@@ -194,4 +194,26 @@ class MemberController extends Controller
$user_info = LoginUserService::getUser(); $user_info = LoginUserService::getUser();
return MemberService::editOrderMember($user_info, $request, $request->ip()); return MemberService::editOrderMember($user_info, $request, $request->ip());
} }
/**|---------------------------------------------------------------------------------
* @name 订单编辑保险公司
* @param array $user_info 用户信息
* @param array $request 请求信息
* @retrun /multitype:array
* @author
* |---------------------------------------------------------------------------------
*/
public function editOrderBus ( Request $request ){
if ($request['edit_type'] == 2) {
// 验证数据
$verify_data = new WashOrderValidator;
$error_message = $verify_data->addBusinessAccValidator($request->all());
if ($error_message) {
return response()->json(['code' => 500, 'msg' => $error_message, 'data' => '参数错误', 'error_message' => $error_message]);
}
}
request()->offsetSet('rt', 'wechat');
$user_info = LoginUserService::getUser();
return MemberService::editOrderBus($user_info, $request, $request->ip());
}
} }
app/Http/Controllers/WeChatApplet/Technician/ServiceProjectController.php
浏览文件 @ 2d440fc8
...@@ -112,6 +112,11 @@ class ServiceProjectController extends Controller ...@@ -112,6 +112,11 @@ class ServiceProjectController extends Controller
$query->where('sepr_name', 'like', '%' . $request['keywords'] . '%'); $query->where('sepr_name', 'like', '%' . $request['keywords'] . '%');
} }
}) })
->where(function ($query) use ($request) { //服务项目名称
if (!empty($request['sepr_class_id'])) {
$query->whereIn('sepr_class_id', $request['sepr_class_id']);
}
})
->select($fields) ->select($fields)
->orderBy('sepr_sort', 'desc') ->orderBy('sepr_sort', 'desc')
->paginate($page_size); ->paginate($page_size);
...@@ -137,6 +142,11 @@ class ServiceProjectController extends Controller ...@@ -137,6 +142,11 @@ class ServiceProjectController extends Controller
$query->where('sepr_id', $request['sepr_id']); $query->where('sepr_id', $request['sepr_id']);
} }
}) })
->where(function ($query) use ($request) { //服务项目名称
if (!empty($request['sepr_class_id'])) {
$query->whereIn('sepr_class_id', $request['sepr_class_id']);
}
})
->select($fields) ->select($fields)
->orderBy('sepr_sort', 'desc') ->orderBy('sepr_sort', 'desc')
->get()->toArray(); ->get()->toArray();
......
app/Http/Controllers/WeChatApplet/Technician/WashOrderController.php
浏览文件 @ 2d440fc8
...@@ -247,7 +247,71 @@ class WashOrderController extends Controller ...@@ -247,7 +247,71 @@ class WashOrderController extends Controller
$post_data['most_moudle_id'] = 1; $post_data['most_moudle_id'] = 1;
addMoudleNum($user_info, $post_data); addMoudleNum($user_info, $post_data);
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'], '生成订单同时生成工单');
}
DB::commit(); DB::commit();
return $this->success('生成订单成功'); return $this->success('生成订单成功');
} else { } else {
...@@ -1377,8 +1441,12 @@ class WashOrderController extends Controller ...@@ -1377,8 +1441,12 @@ class WashOrderController extends Controller
->select('wor_state','wor_id') ->select('wor_state','wor_id')
->first(); ->first();
$work_order = CommonService::dataToArray($work_order); $work_order = CommonService::dataToArray($work_order);
if(in_array($info->ord_state, [1]) && (!$work_order || $work_order['wor_state']<=5) && in_array($info->ord_type, [0,1]) && $info->orcl_sales_adm_id == $user_info->adm_id){ // if(/*in_array($info->ord_state, [1]) && */(!$work_order || $work_order['wor_state']<=5) && in_array($info->ord_type, [0,1])/* && $info->orcl_sales_adm_id == $user_info->adm_id*/){
// $buttonData[] = 'editOrderMember';
// }
if (!in_array($info->ord_wor_state, [11,20])) {
$buttonData[] = 'editOrderMember'; $buttonData[] = 'editOrderMember';
$buttonData[] = 'editOrderBus';
} }
if(in_array($info->ord_wor_state, [1]) || ($info->ord_service_type == 2 && in_array($info->ord_wor_state, [1,2]) )){ if(in_array($info->ord_wor_state, [1]) || ($info->ord_service_type == 2 && in_array($info->ord_wor_state, [1,2]) )){
$buttonData[] = 'cancel'; $buttonData[] = 'cancel';
...@@ -1391,9 +1459,9 @@ class WashOrderController extends Controller ...@@ -1391,9 +1459,9 @@ class WashOrderController extends Controller
$buttonData[] = 'settlement'; $buttonData[] = 'settlement';
} }
//换货 //换货
if(in_array($info->ord_wor_state, [7,1,2]) && !in_array($info->ord_payment_way, [10,11,12]) ){ // if(in_array($info->ord_wor_state, [7,1,2]) && !in_array($info->ord_payment_way, [10,11,12]) ){
$buttonData[] = 'exchangeGoods'; // $buttonData[] = 'exchangeGoods';
} // }
if(!in_array('orderPhone', $pri_operate_method) && $info->ord_wor_state != 7){ if(!in_array('orderPhone', $pri_operate_method) && $info->ord_wor_state != 7){
$info->orcl_phone = substr($info->orcl_phone,0,3).'****'.substr($info->orcl_phone,-4); $info->orcl_phone = substr($info->orcl_phone,0,3).'****'.substr($info->orcl_phone,-4);
$info->orcl_name = mb_substr($info->orcl_name,0,1,'utf-8').str_repeat("*",(strlen($info->orcl_name)/3-1)); $info->orcl_name = mb_substr($info->orcl_name,0,1,'utf-8').str_repeat("*",(strlen($info->orcl_name)/3-1));
......
app/Http/Controllers/WeChatApplet/Technician/WashWorkController.php
浏览文件 @ 2d440fc8
...@@ -522,9 +522,9 @@ class WashWorkController extends Controller ...@@ -522,9 +522,9 @@ class WashWorkController extends Controller
$buttonData[] = 'cancelOrder'; $buttonData[] = 'cancelOrder';
} }
$buttonData[] = 'editOrderExplain'; $buttonData[] = 'editOrderExplain';
if (in_array($info->wor_state, [4, 5, 6]) && $info->wocl_check_car_state == 2 && $info->ord_type!=3) { // if (in_array($info->wor_state, [4, 5, 6]) && $info->wocl_check_car_state == 2 && $info->ord_type!=3) {
$buttonData[] = 'setService'; // $buttonData[] = 'setService';
} // }
$wotp_service_adm_id2 = DB::table('wash_work_technician_part') $wotp_service_adm_id2 = DB::table('wash_work_technician_part')
->where('wotp_wor_id', $info->wor_id) ->where('wotp_wor_id', $info->wor_id)
->where('wotp_work_type', 2) ->where('wotp_work_type', 2)
......
app/Services/Business/WashOrderBasicService.php
浏览文件 @ 2d440fc8
...@@ -1280,28 +1280,29 @@ class WashOrderBasicService extends Service ...@@ -1280,28 +1280,29 @@ class WashOrderBasicService extends Service
if ($request['ord_payment_way'] == 5) { if ($request['ord_payment_way'] == 5) {
OrderSettlementDetails::addOrderSettlementDetails($ord_id, $request['ord_type'], $request, $user_info, $ord_use_vip_price*100, $ord_edit_data['ord_banlance']); OrderSettlementDetails::addOrderSettlementDetails($ord_id, $request['ord_type'], $request, $user_info, $ord_use_vip_price*100, $ord_edit_data['ord_banlance']);
} else { } else {
$request['ord_other_payway'] = 1;
OrderSettlementDetails::addOrderSettlementDetails($ord_id, $request['ord_type'], $request, $user_info, $ord_edit_data['ord_payment_money'], $ord_edit_data['ord_banlance']); OrderSettlementDetails::addOrderSettlementDetails($ord_id, $request['ord_type'], $request, $user_info, $ord_edit_data['ord_payment_money'], $ord_edit_data['ord_banlance']);
} }
} }
// $order_settlement_details['orsd_ord_id'] = $ord_id; // $order_settlement_details['orsd_ord_id'] = $ord_id;
// if ($request['ord_payment_way'] == 9) { // if ($request['ord_payment_way'] == 9) {
// $order_settlement_details['orsd_payment_way'] = $request['ord_other_payway']; // $order_settlement_details['orsd_payment_way'] = $request['ord_other_payway'];
// } else { // } else {
// $order_settlement_details['orsd_payment_way'] = $request['ord_payment_way']; // $order_settlement_details['orsd_payment_way'] = $request['ord_payment_way'];
// } // }
// $order_settlement_details['orsd_pay_money'] = $request['ord_actual_amout']*100; // $order_settlement_details['orsd_pay_money'] = $request['ord_actual_amout']*100;
// $order_settlement_details['orsd_mem_id'] = $request['mem_id']; // $order_settlement_details['orsd_mem_id'] = $request['mem_id'];
// $order_settlement_details['orsd_mem_type'] = $request['ord_type']; // $order_settlement_details['orsd_mem_type'] = $request['ord_type'];
// $order_settlement_details['orsd_create_id'] = $user_info->adm_id; // $order_settlement_details['orsd_create_id'] = $user_info->adm_id;
// $order_settlement_details['orsd_create_time'] = date('Y-m-d H:i:s'); // $order_settlement_details['orsd_create_time'] = date('Y-m-d H:i:s');
// $typeName = WashOrderService::getPaymentWayName(true);//获取支付方式名称 // $typeName = WashOrderService::getPaymentWayName(true);//获取支付方式名称
// $ord_payment_name = WashOrderService::getTypeData($order_settlement_details['orsd_payment_way'], $typeName); // $ord_payment_name = WashOrderService::getTypeData($order_settlement_details['orsd_payment_way'], $typeName);
// if (!empty($request['ord_payment_way'])) { // if (!empty($request['ord_payment_way'])) {
// $order_settlement_details['orsd_payment_way_name'] = $ord_payment_name; // $order_settlement_details['orsd_payment_way_name'] = $ord_payment_name;
// } else { // } else {
// $order_settlement_details['orsd_payment_way_name'] = '未结算'; // $order_settlement_details['orsd_payment_way_name'] = '未结算';
// } // }
// $sede_res = DB::table('order_settlement_details')->insertGetId($order_settlement_details); // $sede_res = DB::table('order_settlement_details')->insertGetId($order_settlement_details);
$ord_edit_data['ord_add_work_state'] = $ord_add_work_state; $ord_edit_data['ord_add_work_state'] = $ord_add_work_state;
$ord_edit_data['ord_orcl_id'] = $orcl_id; $ord_edit_data['ord_orcl_id'] = $orcl_id;
$ord_edit_data['ord_update_time'] = date('Y-m-d H:i:s'); $ord_edit_data['ord_update_time'] = date('Y-m-d H:i:s');
......
app/Services/Business/WashOrderService.php
浏览文件 @ 2d440fc8
...@@ -557,6 +557,9 @@ class WashOrderService extends Service ...@@ -557,6 +557,9 @@ class WashOrderService extends Service
if ($value_b['pri_id'] == 590) {//订单详情 if ($value_b['pri_id'] == 590) {//订单详情
$list_items[$key]->list_button_one[] = $value_b; $list_items[$key]->list_button_one[] = $value_b;
} }
if ($value_b['pri_id'] == 896 && $value->ord_wor_state>=1) {//工单详情
$list_items[$key]->list_button_two[] = $value_b;
}
if ($value_b['pri_id'] == 886 && $value->ord_wor_state == 12) {//审核取消 if ($value_b['pri_id'] == 886 && $value->ord_wor_state == 12) {//审核取消
$list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
} }
...@@ -613,7 +616,10 @@ class WashOrderService extends Service ...@@ -613,7 +616,10 @@ class WashOrderService extends Service
if ((!$work_order || $work_order<=5) && $value_b['pri_id'] == 873 && in_array($value->ord_type, [0,1])) { if ((!$work_order || $work_order<=5) && $value_b['pri_id'] == 873 && in_array($value->ord_type, [0,1])) {
$list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
} }
if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 895 && in_array($value->ord_type, [0,1])) { // if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 895 && in_array($value->ord_type, [0,1])) {
// $list_items[$key]->list_button_two[] = $value_b;
// }
if (!in_array($value->ord_wor_state, [11,20]) && $value_b['pri_id'] == 895) {
$list_items[$key]->list_button_two[] = $value_b; $list_items[$key]->list_button_two[] = $value_b;
} }
if ($value->ord_wor_state == 1 && $value_b['pri_id'] == 589 && $value->ord_source != 5) {//编辑 if ($value->ord_wor_state == 1 && $value_b['pri_id'] == 589 && $value->ord_source != 5) {//编辑
......
app/Services/Finance/WashPerformanceService.php
浏览文件 @ 2d440fc8
...@@ -157,7 +157,7 @@ class WashPerformanceService extends Service ...@@ -157,7 +157,7 @@ class WashPerformanceService extends Service
$list_items[$key]->pewo_performance_total_price = $new_list[$value->pewo_wor_id]['pewo_performance_total_price']; $list_items[$key]->pewo_performance_total_price = $new_list[$value->pewo_wor_id]['pewo_performance_total_price'];
$find_adm_data = DB::table('wash_work_technician_part') $find_adm_data = DB::table('wash_work_technician_part')
->where('wotp_wor_id', $value->pewo_wor_id) ->where('wotp_wor_id', $value->pewo_wor_id)
->select('wotp_service_adm_id', 'wotp_service_adm_name') ->select('wotp_service_adm_id', 'wotp_service_adm_name', 'wotp_work_type')
->get()->toArray(); ->get()->toArray();
$find_adm_lead = DB::table('work_order') $find_adm_lead = DB::table('work_order')
->where('wor_id', $value->pewo_wor_id) ->where('wor_id', $value->pewo_wor_id)
...@@ -166,12 +166,18 @@ class WashPerformanceService extends Service ...@@ -166,12 +166,18 @@ class WashPerformanceService extends Service
foreach ($find_adm_data as $key1 => $value1) { foreach ($find_adm_data as $key1 => $value1) {
if ($value1->wotp_service_adm_id == $find_adm_lead) { if ($value1->wotp_service_adm_id == $find_adm_lead) {
$list_items[$key]->adm_name_leader = $value1->wotp_service_adm_name; $list_items[$key]->adm_name_leader = $value1->wotp_service_adm_name;
} else { }
if ($value1->wotp_work_type == 1) {
$work_type_name = '(验件)';
}elseif ($value1->wotp_work_type == 2) {
$work_type_name = '(施工)';
}elseif ($value1->wotp_work_type == 3) {
$work_type_name = '(还件)';
}
if (empty($number)) { if (empty($number)) {
$number = $value1->wotp_service_adm_name; $number = $value1->wotp_service_adm_name.$work_type_name;
} else { } else {
$number = $number.' '.$value1->wotp_service_adm_name; $number = $number.', '.$value1->wotp_service_adm_name.$work_type_name;
}
} }
} }
$list_items[$key]->adm_name_numbers = $number; $list_items[$key]->adm_name_numbers = $number;
......
app/Services/WeChatApplet/Technician/MemberService.php
浏览文件 @ 2d440fc8
...@@ -592,9 +592,9 @@ class MemberService extends Service ...@@ -592,9 +592,9 @@ class MemberService extends Service
if(!$order){ if(!$order){
return ['code' => 500, 'msg' => '单号不存在', 'data' => '单号不存在']; return ['code' => 500, 'msg' => '单号不存在', 'data' => '单号不存在'];
} }
if($order['ord_state']!=1){ // if($order['ord_state']!=1){
return ['code' => 500, 'msg' => '订单已结算', 'data' => '订单已结算']; // return ['code' => 500, 'msg' => '订单已结算', 'data' => '订单已结算'];
} // }
$work_order = DB::table('work_order') $work_order = DB::table('work_order')
->where('wor_order_id',$order['ord_id']) ->where('wor_order_id',$order['ord_id'])
->select('wor_state','wor_id') ->select('wor_state','wor_id')
...@@ -604,7 +604,7 @@ class MemberService extends Service ...@@ -604,7 +604,7 @@ class MemberService extends Service
return ['code' => 500, 'msg' => '工单已验件', 'data' => '工单已验件']; return ['code' => 500, 'msg' => '工单已验件', 'data' => '工单已验件'];
} }
// 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id // 判断是否为加盟店账号,shop_superior_id 为0 是总店，不为0，是总店id或加盟店id
$shop_id = $user_info->shop_superior_id ? $user_info->shop_superior_id : $user_info->adm_shop_id; $shop_id = isset($user_info->shop_superior_id) ? $user_info->shop_superior_id : $user_info->adm_shop_id;
DB::beginTransaction(); //开启回滚事物 DB::beginTransaction(); //开启回滚事物
$mem_add_data['buac_name'] = $request['buac_name']; $mem_add_data['buac_name'] = $request['buac_name'];
$mem_add_data['buac_phone'] = $request['buac_phone']; $mem_add_data['buac_phone'] = $request['buac_phone'];
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论