提交 ccf27f0c authored 作者: 窦斌's avatar 窦斌

edit

上级 4f56b06e
...@@ -506,4 +506,15 @@ class PublicSearchController extends Controller ...@@ -506,4 +506,15 @@ class PublicSearchController extends Controller
} }
return response()->json(['code'=>200,'msg'=>'success','data'=>$new_data]); return response()->json(['code'=>200,'msg'=>'success','data'=>$new_data]);
} }
/**|---------------------------------------------------------------------------------
* @name 获取服务标准
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2026/4/24 9:59
* |---------------------------------------------------------------------------------
*/
public function getServiceStandard ( Request $request ){
$service = new PublicSearch();
return $service->getServiceStandard();
}
} }
...@@ -1608,7 +1608,7 @@ class CashierDeskController extends Controller ...@@ -1608,7 +1608,7 @@ class CashierDeskController extends Controller
$find_order = DB::table('order') $find_order = DB::table('order')
->leftjoin('order_client as oc', 'oc.orcl_ord_id', '=', 'order.ord_id') ->leftjoin('order_client as oc', 'oc.orcl_ord_id', '=', 'order.ord_id')
->where('ord_id', $request['ord_id']) ->where('ord_id', $request['ord_id'])
->select('ord_order_number', 'ord_service_type', 'ord_payment_way', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'ord_other_system_number', 'ord_actual_price', 'ord_ware_id', 'ord_collection_price', 'ord_remark', 'orcl_shipment_party', 'orcl_assign_price', 'orcl_rescue_assign_price', 'orcl_rescue_service_price', 'orcl_rescue_collection_price', 'orcl_adm_id', 'orcl_whether_app', 'orcl_order_type', 'orcl_shit_id') ->select('ord_order_number', 'ord_service_type', 'ord_payment_way', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'ord_other_system_number', 'ord_actual_price', 'ord_ware_id', 'ord_collection_price', 'ord_remark', 'orcl_shipment_party', 'orcl_assign_price', 'orcl_rescue_assign_price', 'orcl_rescue_service_price', 'orcl_rescue_collection_price', 'orcl_adm_id', 'orcl_whether_app', 'orcl_order_type', 'orcl_shit_id','ord_service_standard')
->first(); ->first();
if (!empty($request['goo_id']) && $find_order->ord_service_type != 7) { if (!empty($request['goo_id']) && $find_order->ord_service_type != 7) {
// 验证数据,提交数据 // 验证数据,提交数据
...@@ -1931,6 +1931,7 @@ class CashierDeskController extends Controller ...@@ -1931,6 +1931,7 @@ class CashierDeskController extends Controller
$wor_data['wor_collection_price'] = $goo_collection_price + $orcl_rescue_collection_price * 100; //商品代收金额(单位:分) $wor_data['wor_collection_price'] = $goo_collection_price + $orcl_rescue_collection_price * 100; //商品代收金额(单位:分)
$wor_data['wor_goo_amount'] = $goo_all_quantity; //总的商品数量 $wor_data['wor_goo_amount'] = $goo_all_quantity; //总的商品数量
$wor_data['wor_update_time'] = date('Y-m-d H:i:s'); $wor_data['wor_update_time'] = date('Y-m-d H:i:s');
$wor_data['wor_service_standard'] = $find_order->ord_service_standard;
$wor_id = DB::table('work_order')->insertGetId($wor_data); $wor_id = DB::table('work_order')->insertGetId($wor_data);
DB::table('order_remarks') DB::table('order_remarks')
...@@ -2544,6 +2545,7 @@ class CashierDeskController extends Controller ...@@ -2544,6 +2545,7 @@ class CashierDeskController extends Controller
$wor_data['wor_appoint_time'] = $request['orcl_appoint_time']; //预约时间 $wor_data['wor_appoint_time'] = $request['orcl_appoint_time']; //预约时间
} }
$wor_data['wor_update_time'] = date('Y-m-d H:i:s'); $wor_data['wor_update_time'] = date('Y-m-d H:i:s');
$ord_data['wor_service_standard'] = $request['service_standard']??1;
$wor_id = DB::table('work_order')->insertGetId($wor_data); $wor_id = DB::table('work_order')->insertGetId($wor_data);
// 添加工单备注 // 添加工单备注
......
...@@ -141,7 +141,7 @@ class WashOrderController extends Controller ...@@ -141,7 +141,7 @@ class WashOrderController extends Controller
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id') ->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->where('ord_id', $order_data['data']['ord_id']) ->where('ord_id', $order_data['data']['ord_id'])
->where('ord_shop_id', $user_info->adm_shop_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') ->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', 'ord_service_standard')
->first(); ->first();
$post_data['ord_service_type'] = $find_order_data->ord_service_type; $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_type'] = $find_order_data->ord_address_type;
......
...@@ -238,4 +238,16 @@ class PublicSearchController extends Controller ...@@ -238,4 +238,16 @@ class PublicSearchController extends Controller
return response()->json(['code'=>200, 'msg'=>'success', 'data_info'=>$data_info]); return response()->json(['code'=>200, 'msg'=>'success', 'data_info'=>$data_info]);
} }
/**|---------------------------------------------------------------------------------
* @name 获取服务标准
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2026/4/24 9:59
* |---------------------------------------------------------------------------------
*/
public function getServiceStandard ( Request $request ){
$service = new PublicSearch();
$data = $service->getServiceStandard();
return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$data]);
}
} }
...@@ -89,6 +89,7 @@ class Order extends Model ...@@ -89,6 +89,7 @@ class Order extends Model
} }
$ord_data['ord_unique_string'] = $request['ord_unique_string']; //生成订单的唯一标识 $ord_data['ord_unique_string'] = $request['ord_unique_string']; //生成订单的唯一标识
$ord_data['ord_update_time'] = date('Y-m-d H:i:s'); $ord_data['ord_update_time'] = date('Y-m-d H:i:s');
$ord_data['ord_service_standard'] = $request['service_standard']??1;
$ord_id = DB::table('order')->insertGetId($ord_data); $ord_id = DB::table('order')->insertGetId($ord_data);
// 救援单的服务项目金额 // 救援单的服务项目金额
......
...@@ -493,4 +493,25 @@ class PublicSearch extends Model ...@@ -493,4 +493,25 @@ class PublicSearch extends Model
->get()->toArray(); ->get()->toArray();
return ['code'=>200, 'msg'=>'success', 'data'=>$list_data]; return ['code'=>200, 'msg'=>'success', 'data'=>$list_data];
} }
/**|---------------------------------------------------------------------------------
* @name 获取服务标准
* @param [bool] $type 请求类型
* @retrun /multitype:array
* @author dou 2026/4/24 10:00
* |---------------------------------------------------------------------------------
*/
public function getServiceStandard ( $type = false ){
$data = [
['type'=>1,'name'=>'常规'],
['type'=>2,'name'=>'钣金数据维修'],
['type'=>3,'name'=>'钣金精修'],
['type'=>4,'name'=>'无痕'],
['type'=>5,'name'=>'大灯深度维修'],
];
if( $type ){
$data = array_column($data, 'name' , 'type');
}
return $data;
}
} }
...@@ -219,6 +219,7 @@ class WashOrderBasicService extends Service ...@@ -219,6 +219,7 @@ class WashOrderBasicService extends Service
} }
$data['ord_source'] = static::getOrdsource($request); // 来源 1 pc 2 车主小程序 3 技师 $data['ord_source'] = static::getOrdsource($request); // 来源 1 pc 2 车主小程序 3 技师
$data['ord_update_time'] = date('Y-m-d H:i:s'); $data['ord_update_time'] = date('Y-m-d H:i:s');
$data['ord_service_standard'] = $request['service_standard']??1;
$data['ord_unique_string'] = $request['ord_unique_string']; $data['ord_unique_string'] = $request['ord_unique_string'];
$data['ord_explain'] = !empty($request['ord_explain']) ? $request['ord_explain'] : ''; $data['ord_explain'] = !empty($request['ord_explain']) ? $request['ord_explain'] : '';
// $ord_id = WashOrder::insertGetId($data); // $ord_id = WashOrder::insertGetId($data);
......
...@@ -2988,7 +2988,7 @@ class WashWorkService extends Service ...@@ -2988,7 +2988,7 @@ class WashWorkService extends Service
->leftJoin('shop as s', 's.shop_id', '=', 'wo.wor_shop_id') ->leftJoin('shop as s', 's.shop_id', '=', 'wo.wor_shop_id')
->where('wor_id', $request['wor_id']) ->where('wor_id', $request['wor_id'])
->where('wor_shop_id', $user_info->adm_shop_id) ->where('wor_shop_id', $user_info->adm_shop_id)
->select('wor_id', 'wor_number', 'wor_create_id', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_service_quality', 'wocl_car_vin', 'shop_store_name', 'wor_service_state', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'orcl_sales_adm_id', 'wocl_car_brand_series', 'wocl_carowner_name', 'wocl_carowner_phone', 'wor_create_time', 'wor_new_goo_amount', 'wor_explain as wor_remark', 'wocl_bus_name', 'wor_address_type', 'wor_address_id', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_order_id', 'wor_work_type', 'wor_other_audit', 'ord_type', 'ord_address', 'orcl_cus_msg', 'ord_id', 'orcl_cus_msg','orcl_mileage', 'orcl_check_goods', 'orcl_check_goods', 'wor_order_number', 'wor_list_pic', 'ord_new_type','ord_state', 'orcl_4sname', 'orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_name', 'orcl_phone', 'orcl_address', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_car_num', 'orcl_car_vin') ->select('wor_id', 'wor_number', 'wor_create_id', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_service_quality', 'wocl_car_vin', 'shop_store_name', 'wor_service_state', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'orcl_sales_adm_id', 'wocl_car_brand_series', 'wocl_carowner_name', 'wocl_carowner_phone', 'wor_create_time', 'wor_new_goo_amount', 'wor_explain as wor_remark', 'wocl_bus_name', 'wor_address_type', 'wor_address_id', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_order_id', 'wor_work_type', 'wor_other_audit', 'ord_type', 'ord_address', 'orcl_cus_msg', 'ord_id', 'orcl_cus_msg','orcl_mileage', 'orcl_check_goods', 'orcl_check_goods', 'wor_order_number', 'wor_list_pic', 'ord_new_type','ord_state', 'orcl_4sname', 'orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_name', 'orcl_phone', 'orcl_address', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_car_num', 'orcl_car_vin', 'ord_other_system_number')
->first(); ->first();
if (empty($info)) { if (empty($info)) {
return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前工单不存在', 'data'=>'']; return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前工单不存在', 'data'=>''];
...@@ -3503,7 +3503,7 @@ class WashWorkService extends Service ...@@ -3503,7 +3503,7 @@ class WashWorkService extends Service
->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id') ->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
->leftJoin('shop as c', 'ord.ord_shop_id', '=', 'c.shop_id') ->leftJoin('shop as c', 'ord.ord_shop_id', '=', 'c.shop_id')
->where('ord_id', $request['ord_id']) ->where('ord_id', $request['ord_id'])
->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_create_time', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'shop_store_name', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_sales_adm_id', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type','ord_shop_id', 'ord_order_price', 'orcl_cus_msg', 'ord_new_type', 'ord_source', 'ord_add_type', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname') ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_create_time', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'shop_store_name', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_sales_adm_id', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type','ord_shop_id', 'ord_order_price', 'orcl_cus_msg', 'ord_new_type', 'ord_source', 'ord_add_type', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'ord_other_system_number')
->first(); ->first();
if (empty($info)) { if (empty($info)) {
return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>'']; return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>''];
...@@ -6311,7 +6311,6 @@ class WashWorkService extends Service ...@@ -6311,7 +6311,6 @@ class WashWorkService extends Service
->value('adm_shop_leave'); ->value('adm_shop_leave');
$list_button = getAppletListButton($request['api_token'], 40); $list_button = getAppletListButton($request['api_token'], 40);
$pri_id = array_column($list_button, 'pri_id'); $pri_id = array_column($list_button, 'pri_id');
CommonService::startmysql();
if($adm_leave == 1 || in_array(79,$pri_id)){ if($adm_leave == 1 || in_array(79,$pri_id)){
$wor_count = DB::table('work_order') $wor_count = DB::table('work_order')
->leftJoin('wash_work_technician_part as c', 'c.wotp_wor_id', '=', 'wor_id'); ->leftJoin('wash_work_technician_part as c', 'c.wotp_wor_id', '=', 'wor_id');
...@@ -6326,7 +6325,6 @@ class WashWorkService extends Service ...@@ -6326,7 +6325,6 @@ class WashWorkService extends Service
->where('wor_collection_bill', 1) //是否代收账单:1正常工单2代收账单 ->where('wor_collection_bill', 1) //是否代收账单:1正常工单2代收账单
->whereIn('wor_state', [5,6,7,9]) //1.新订单 2未派单 3待接单/已派单 5.已接单/待验车 6.已验车(显示开始施工按钮) 7施工中(提交施工按钮) 8.待审核/完成待审核 ->whereIn('wor_state', [5,6,7,9]) //1.新订单 2未派单 3待接单/已派单 5.已接单/待验车 6.已验车(显示开始施工按钮) 7施工中(提交施工按钮) 8.待审核/完成待审核
->select(DB::raw('count(DISTINCT wotp_wor_id) as count, wor_state')); ->select(DB::raw('count(DISTINCT wotp_wor_id) as count, wor_state'));
$data
if($adm_leave == 1 || in_array(79,$pri_id)) { if($adm_leave == 1 || in_array(79,$pri_id)) {
$wor_count = $wor_count->groupBy('wor_state'); $wor_count = $wor_count->groupBy('wor_state');
}else{ }else{
......
...@@ -1189,6 +1189,7 @@ Route::namespace('Api')->group(function () { ...@@ -1189,6 +1189,7 @@ Route::namespace('Api')->group(function () {
Route::post('v3/PublicSearch/searchExaminationItem', 'PublicsManage\PublicSearchController@searchExaminationItem'); //洗美-搜索考核项 Route::post('v3/PublicSearch/searchExaminationItem', 'PublicsManage\PublicSearchController@searchExaminationItem'); //洗美-搜索考核项
Route::post('v3/PublicSearch/searchQualityInspectionItem', 'PublicsManage\PublicSearchController@searchQualityInspectionItem'); //洗美-搜索质检项 Route::post('v3/PublicSearch/searchQualityInspectionItem', 'PublicsManage\PublicSearchController@searchQualityInspectionItem'); //洗美-搜索质检项
Route::post('v3/PublicSearch/getParts', 'PublicsManage\PublicSearchController@getParts'); //洗美-获取部位 Route::post('v3/PublicSearch/getParts', 'PublicsManage\PublicSearchController@getParts'); //洗美-获取部位
Route::post('v3/PublicSearch/getServiceStandard', 'PublicsManage\PublicSearchController@getServiceStandard'); //获取服务标准
// 财务系统 -- 发送短信的模板设置相关路由 // 财务系统 -- 发送短信的模板设置相关路由
Route::post('v3/NoteMessage/listTemplate', 'AccountControl\NoteMessageController@listTemplate'); //模板列表 Route::post('v3/NoteMessage/listTemplate', 'AccountControl\NoteMessageController@listTemplate'); //模板列表
...@@ -1477,6 +1478,7 @@ Route::namespace('WeChatApplet')->group(function () { ...@@ -1477,6 +1478,7 @@ Route::namespace('WeChatApplet')->group(function () {
Route::post('w1/PublicSearch/searchFreight', 'PublicsManage\PublicSearchController@searchFreight'); //搜索仓位 Route::post('w1/PublicSearch/searchFreight', 'PublicsManage\PublicSearchController@searchFreight'); //搜索仓位
Route::post('w1/PublicSearch/searchFreightGoods', 'PublicsManage\PublicSearchController@searchFreightGoods'); //搜索采购退货仓位 Route::post('w1/PublicSearch/searchFreightGoods', 'PublicsManage\PublicSearchController@searchFreightGoods'); //搜索采购退货仓位
Route::post('w1/PublicSearch/searchQualityReward', 'PublicsManage\PublicSearchController@searchQualityReward'); //搜索质检项 Route::post('w1/PublicSearch/searchQualityReward', 'PublicsManage\PublicSearchController@searchQualityReward'); //搜索质检项
Route::post('w1/PublicSearch/getServiceStandard', 'PublicsManage\PublicSearchController@getServiceStandard'); //获取服务标准
// 洗美技师小程序路由 // 洗美技师小程序路由
Route::post('w1/WashWork/home', 'Technician\WashWorkController@home'); //首页-预约信息列表 Route::post('w1/WashWork/home', 'Technician\WashWorkController@home'); //首页-预约信息列表
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论