|
@@ -499,13 +499,12 @@ class WebsiteService implements WebsiteServiceInterface
|
|
public function getWebsiteAdvertisement(array $data): array
|
|
public function getWebsiteAdvertisement(array $data): array
|
|
{
|
|
{
|
|
$where = [
|
|
$where = [
|
|
- 'website_id' => $data['website_id'],
|
|
|
|
'ad_place.status' => 1,
|
|
'ad_place.status' => 1,
|
|
- // 'ad.status' => 1,
|
|
|
|
];
|
|
];
|
|
if(isset($data['ad_tag']) && !empty($data['ad_tag'])){
|
|
if(isset($data['ad_tag']) && !empty($data['ad_tag'])){
|
|
$now = Carbon::now()->format('Y-m-d H:i:s'); // 获取当前时间
|
|
$now = Carbon::now()->format('Y-m-d H:i:s'); // 获取当前时间
|
|
$where[] = ['ad_place.ad_tag','like','%'.$data['ad_tag'].'%'];
|
|
$where[] = ['ad_place.ad_tag','like','%'.$data['ad_tag'].'%'];
|
|
|
|
+ // return Result::success($where);
|
|
$result = AdPlace::where($where)
|
|
$result = AdPlace::where($where)
|
|
->leftJoin("ad", function ($join) use ($now) {
|
|
->leftJoin("ad", function ($join) use ($now) {
|
|
$join->on("ad.pid", "=", "ad_place.id")
|
|
$join->on("ad.pid", "=", "ad_place.id")
|
|
@@ -1464,6 +1463,7 @@ class WebsiteService implements WebsiteServiceInterface
|
|
if(isset($data['website_id']) &&!empty($data['website_id'])){
|
|
if(isset($data['website_id']) &&!empty($data['website_id'])){
|
|
$website = Website::where('id',$data['website_id'])->where('status',1)->first();
|
|
$website = Website::where('id',$data['website_id'])->where('status',1)->first();
|
|
if (empty($website)) {
|
|
if (empty($website)) {
|
|
|
|
+
|
|
return Result::error("暂无该网站",0);
|
|
return Result::error("暂无该网站",0);
|
|
}
|
|
}
|
|
$category = WebsiteCategory::where('website_id',$data['website_id'])->where('category_id',$data['category_id'])->first();
|
|
$category = WebsiteCategory::where('website_id',$data['website_id'])->where('category_id',$data['category_id'])->first();
|
|
@@ -1471,6 +1471,9 @@ class WebsiteService implements WebsiteServiceInterface
|
|
return Result::error("暂无此导航",0);
|
|
return Result::error("暂无此导航",0);
|
|
}
|
|
}
|
|
$category['children_count'] = WebsiteCategory::where('website_id',$data['website_id'])->where('pid',$data['category_id'])->count();
|
|
$category['children_count'] = WebsiteCategory::where('website_id',$data['website_id'])->where('pid',$data['category_id'])->count();
|
|
|
|
+ $parent = WebsiteCategory::where('website_id',$data['website_id'])->where('category_id',$category['pid'])->select('category_id as parent_id','alias as parent_name')->first();
|
|
|
|
+ $category['parent_id'] = $parent['parent_id']?? '';
|
|
|
|
+ $category['parent_name'] = $parent['parent_name']?? '';
|
|
return Result::success($category);
|
|
return Result::success($category);
|
|
}else{
|
|
}else{
|
|
return Result::error("参数错误",0);
|
|
return Result::error("参数错误",0);
|