|
@@ -2579,14 +2579,16 @@ class OrderController extends Controller
|
2579
|
2579
|
$name = $request->input('receiverName');
|
2580
|
2580
|
$phone = $request->input('receiverMobile');
|
2581
|
2581
|
$page = $request->input('page',1);
|
|
2582
|
+ $service_type = $request->input('service_type');
|
2582
|
2583
|
$pageSize = 20;
|
2583
|
2584
|
$offset = ($page - 1)*$pageSize;
|
2584
|
2585
|
|
2585
|
2586
|
//总数据条数
|
2586
|
|
- $count = DB::table('customer_service_after_sale_order')->where(function($query) use ($order_id, $name, $phone) {
|
|
2587
|
+ $count = DB::table('customer_service_after_sale_order')->where(function($query) use ($order_id, $name, $phone, $service_type) {
|
2587
|
2588
|
if($order_id) $query->where('order_id',$order_id);
|
2588
|
2589
|
if($name) $query->where('receiverName','like','%'.$name.'%');
|
2589
|
2590
|
if($phone) $query->where('receiverMobile','like','%'.$phone.'%');
|
|
2591
|
+ if($service_type != 0) $query->where('service_type', $service_type);
|
2590
|
2592
|
})->count();
|
2591
|
2593
|
|
2592
|
2594
|
if ($count > 1) {
|
|
@@ -2597,10 +2599,11 @@ class OrderController extends Controller
|
2597
|
2599
|
$pages = 1;
|
2598
|
2600
|
}
|
2599
|
2601
|
|
2600
|
|
- $result = DB::table('customer_service_after_sale_order')->where(function($query) use ($order_id, $name, $phone) {
|
|
2602
|
+ $result = DB::table('customer_service_after_sale_order')->where(function($query) use ($order_id, $name, $phone, $service_type) {
|
2601
|
2603
|
if($order_id) $query->where('order_id',$order_id);
|
2602
|
2604
|
if($name) $query->where('receiverName','like','%'.$name.'%');
|
2603
|
2605
|
if($phone) $query->where('receiverMobile','like','%'.$phone.'%');
|
|
2606
|
+ if($service_type != 0) $query->where('service_type', $service_type);
|
2604
|
2607
|
})->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
|
2605
|
2608
|
$result = json_decode(json_encode($result),true);
|
2606
|
2609
|
|
|
@@ -2640,6 +2643,7 @@ class OrderController extends Controller
|
2640
|
2643
|
'order_id' => $order_id,
|
2641
|
2644
|
'receiverName' => $name,
|
2642
|
2645
|
'receiverMobile' => $phone,
|
|
2646
|
+ 'service_type' => $service_type,
|
2643
|
2647
|
]);
|
2644
|
2648
|
}
|
2645
|
2649
|
|