|
|
@@ -51,7 +51,8 @@ class ViolationStoreJobs implements ShouldQueue
|
|
|
$insert_data =['name' =>'违规挂网店铺', 'code' => 'ViolationStoreJobs', 'admin_id' => $admin_id];
|
|
|
$executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
|
|
|
}
|
|
|
- $list_config_data = $ViolationStoreModel->where('status', 0)->where('store_type', 1)->paginate($limit, ['*'], 'page', $page)->toarray();
|
|
|
+ $list_config_data = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_store.category_id')
|
|
|
+ ->where('washconfig_violation_store.status', 0)->where('store_type', 1)->select(['washconfig_violation_store.*','washconfig_company_category.name as category_name'])->paginate($limit, ['*'], 'page', $page)->toarray();
|
|
|
if (!$list_config_data || empty($list_config_data['data'])) {
|
|
|
return true;
|
|
|
}
|
|
|
@@ -65,6 +66,7 @@ class ViolationStoreJobs implements ShouldQueue
|
|
|
'company_name' => $value['company_name'],
|
|
|
'social_credit_code' => $value['social_credit_code'],
|
|
|
'executeLog_id' => $executeLog_id,
|
|
|
+ 'company_category_name' => $value['category_name']
|
|
|
];
|
|
|
ViolationStoreDataJobs::dispatch($message_data);
|
|
|
// ViolationStoreDataJobs::dispatchSync($message_data);
|