|
@@ -18,6 +18,7 @@ use App\Models\Manager\Citys as CitysModel;
|
|
|
use App\Models\Manager\Personnel\EmployeePlatform as EmployeePlatformModel;
|
|
use App\Models\Manager\Personnel\EmployeePlatform as EmployeePlatformModel;
|
|
|
use App\Models\Manager\Personnel\EmployeeArea as EmployeeAreaModel;
|
|
use App\Models\Manager\Personnel\EmployeeArea as EmployeeAreaModel;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
|
|
|
+use Illuminate\Support\Carbon;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 数据清洗-违规店铺清洗数据队列
|
|
* 数据清洗-违规店铺清洗数据队列
|
|
@@ -81,11 +82,16 @@ class ViolationStoreDataJobs implements ShouldQueue
|
|
|
$page = isset($message_data['page']) ? $message_data['page'] : 1;
|
|
$page = isset($message_data['page']) ? $message_data['page'] : 1;
|
|
|
$company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;//品牌方公司ID
|
|
$company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;//品牌方公司ID
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ $last7DaysStart = Carbon::today()->subDays(6)->startOfDay()->getTimestamp(); // 7天前开始
|
|
|
|
|
+ $last7DaysEnd = Carbon::today()->endOfDay()->getTimestamp(); // 到今天结束
|
|
|
|
|
+ $where_map[] = ['insert_time', '>=', $last7DaysStart];
|
|
|
|
|
+ $where_map[] = ['insert_time', '<=', $last7DaysEnd];
|
|
|
if ($platform != '0') {
|
|
if ($platform != '0') {
|
|
|
$platform = explode(',', $platform);
|
|
$platform = explode(',', $platform);
|
|
|
- $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->whereIn('platform_id', $platform);
|
|
|
|
|
|
|
+ $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->where($where_map)->whereIn('platform_id', $platform);
|
|
|
} else {
|
|
} else {
|
|
|
- $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code);
|
|
|
|
|
|
|
+ $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->where($where_map);
|
|
|
}
|
|
}
|
|
|
$product_data_info = $ScrapeDataModel->paginate($limit, ['*'], 'page', $page)->toarray();
|
|
$product_data_info = $ScrapeDataModel->paginate($limit, ['*'], 'page', $page)->toarray();
|
|
|
$product_datas = $product_data_info['data'];
|
|
$product_datas = $product_data_info['data'];
|