|
|
@@ -261,6 +261,7 @@ class BasicPanel extends Controller
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
//终端类型B端、C端、OTO
|
|
|
+ $province_id = request('province_id', ''); //省份id
|
|
|
$terminal_type = request('terminal_type', '');
|
|
|
$product_name = request('product_name', ''); //商品名称
|
|
|
$yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
|
|
|
@@ -282,6 +283,7 @@ class BasicPanel extends Controller
|
|
|
$map[] = ['company_id', '=', $admin_company_id];
|
|
|
}
|
|
|
if ($product_name) $map[] = ['product_name', 'like', '%' . $product_name . '%'];
|
|
|
+ if ($province_id) $map[] = ['province_id', '=', $province_id];
|
|
|
// 禁止挂网省份统计
|
|
|
$violationProductModel = $violationProductModel->query();
|
|
|
if ($terminal_type) {
|
|
|
@@ -681,6 +683,7 @@ class BasicPanel extends Controller
|
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
|
|
|
//终端类型B端、C端、OTO
|
|
|
+ $province_id = request('province_id', ''); //省份id
|
|
|
$terminal_type = request('terminal_type', '');
|
|
|
$product_name = request('product_name', ''); //商品名称
|
|
|
$yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
|
|
|
@@ -702,6 +705,7 @@ class BasicPanel extends Controller
|
|
|
$map[] = ['company_id', '=', $admin_company_id];
|
|
|
}
|
|
|
if ($product_name) $map[] = ['product_name', 'like', '%' . $product_name . '%'];
|
|
|
+ if ($province_id) $map[] = ['province_id', '=', $province_id];
|
|
|
// 禁止挂网城市统计
|
|
|
$LowPriceGoodsModel = $LowPriceGoodsModel->query();
|
|
|
if ($terminal_type) {
|