|
|
@@ -63,6 +63,8 @@ class ViolationProduct extends Controller
|
|
|
$continuous_listing_count = request('continuous_listing_count', '');
|
|
|
$province_ids = request('province_ids', '');
|
|
|
$city_ids = request('city_ids', '');
|
|
|
+ $shipment_province_ids = request('shipment_province_ids', '');
|
|
|
+ $shipment_city_ids = request('shipment_city_ids', '');
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
@@ -158,6 +160,16 @@ class ViolationProduct extends Controller
|
|
|
$city_ids = explode(',', $city_ids);
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('city_id', $city_ids);
|
|
|
}
|
|
|
+ //多选发货省份
|
|
|
+ if ($shipment_province_ids && is_string($shipment_province_ids)) {
|
|
|
+ $shipment_province_ids = explode(',', $shipment_province_ids);
|
|
|
+ $ViolationProductModel = $ViolationProductModel->whereIn('shipment_province_id', $shipment_province_ids);
|
|
|
+ }
|
|
|
+ //多选发货城市
|
|
|
+ if ($shipment_city_ids && is_string($shipment_city_ids)) {
|
|
|
+ $shipment_city_ids = explode(',', $shipment_city_ids);
|
|
|
+ $ViolationProductModel = $ViolationProductModel->whereIn('shipment_city_id', $shipment_city_ids);
|
|
|
+ }
|
|
|
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$result = $ViolationProductModel->where(function ($q) use ($user_id) {
|
|
|
@@ -230,6 +242,8 @@ class ViolationProduct extends Controller
|
|
|
$category_name = request('category_name', '');
|
|
|
$province_ids = request('province_ids', '');
|
|
|
$city_ids = request('city_ids', '');
|
|
|
+ $shipment_province_ids = request('shipment_province_ids', '');
|
|
|
+ $shipment_city_ids = request('shipment_city_ids', '');
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
@@ -321,6 +335,16 @@ class ViolationProduct extends Controller
|
|
|
$city_ids = explode(',', $city_ids);
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('city_id', $city_ids);
|
|
|
}
|
|
|
+ //多选发货省份
|
|
|
+ if ($shipment_province_ids && is_string($shipment_province_ids)) {
|
|
|
+ $shipment_province_ids = explode(',', $shipment_province_ids);
|
|
|
+ $ViolationProductModel = $ViolationProductModel->whereIn('shipment_province_id', $shipment_province_ids);
|
|
|
+ }
|
|
|
+ //多选发货城市
|
|
|
+ if ($shipment_city_ids && is_string($shipment_city_ids)) {
|
|
|
+ $shipment_city_ids = explode(',', $shipment_city_ids);
|
|
|
+ $ViolationProductModel = $ViolationProductModel->whereIn('shipment_city_id', $shipment_city_ids);
|
|
|
+ }
|
|
|
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$result_totle = $ViolationProductModel->where(function ($q) use ($user_id) {
|