|
@@ -84,7 +84,7 @@ class AdvertiserController extends CatchController
|
|
|
return $query->where('users.username', 'like', '%'.$username.'%');
|
|
|
})
|
|
|
->select(
|
|
|
- 'users.id', 'users.username', 'users.email', 'users.status',
|
|
|
+ 'users.id', 'users.username', 'users.email', 'users.status', 'users.remark',
|
|
|
DB::raw("from_unixtime(users.created_at) as created_at"),
|
|
|
DB::raw("group_concat(distinct user_has_miniprograms.miniprogram_id separator ',') as miniProgramIds"),
|
|
|
DB::raw("NULL as miniPrograms")
|
|
@@ -95,6 +95,7 @@ class AdvertiserController extends CatchController
|
|
|
collect($res->items())->pluck('miniProgramIds')->each(function ($item) use (&$miniProgramIds) {
|
|
|
$miniProgramIds = $miniProgramIds->merge(explode(',', $item));
|
|
|
});
|
|
|
+ $logos = config('common.common.logos');
|
|
|
if($miniProgramIds->count()) {
|
|
|
$miniPrograms = DB::table('miniprogram')->whereIn('id', $miniProgramIds->unique())
|
|
|
->select('id', 'name', 'type')
|
|
@@ -102,7 +103,9 @@ class AdvertiserController extends CatchController
|
|
|
foreach ($res as $item) {
|
|
|
$item->miniPrograms = [];
|
|
|
foreach (explode(',', $item->miniProgramIds) as $miniProgramId) {
|
|
|
- $item->miniPrograms[] = $miniPrograms->get($miniProgramId);
|
|
|
+ $miniProgram = $miniPrograms->get($miniProgramId);
|
|
|
+ $miniProgram->type_logo = $logos[$miniProgram->type] ?? '';
|
|
|
+ $item->miniPrograms[] = $miniProgram;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -187,8 +190,16 @@ class AdvertiserController extends CatchController
|
|
|
->get()->pluck('miniprogram_id')->toArray();
|
|
|
|
|
|
$user->miniProgramIds = $miniProgramIds;
|
|
|
+ $logos = config('common.common.logos');
|
|
|
$user->miniPrograms = DB::table('miniprogram')->whereIn('id', array_unique($miniProgramIds))
|
|
|
- ->select('id', 'name', 'type')->get();
|
|
|
+ ->select('id', 'name', 'type')->get()->map(function ($item) use ($logos){
|
|
|
+ return [
|
|
|
+ 'id' => $item->id,
|
|
|
+ 'name' => $item->name,
|
|
|
+ 'type' => $item->type,
|
|
|
+ 'type_logo' => $logos[$item->type] ?? ''
|
|
|
+ ];
|
|
|
+ });
|
|
|
return $user;
|
|
|
}
|
|
|
}
|