|
|
|
@ -77,7 +77,9 @@ class ActivityService implements ActivityServiceInterface |
|
|
|
$settingsStr = $activitySettings[$activity['type']] ?? ''; |
|
|
|
$activity['settings'] = json_decode($settingsStr, true); |
|
|
|
$activity['settings'] = !empty($activity['settings']) ? $activity['settings'] : (object)[]; |
|
|
|
$activity['goods'] = []; |
|
|
|
|
|
|
|
if ($activity['settings']['show_type'] == 'list') { |
|
|
|
$storeTable = ApplicationContext::getContainer()->get(Store::class)->getTable(); |
|
|
|
$goodsTable = ApplicationContext::getContainer()->get(GoodsActivity::class)->getTable(); |
|
|
|
|
|
|
|
@ -114,6 +116,7 @@ class ActivityService implements ActivityServiceInterface |
|
|
|
} |
|
|
|
|
|
|
|
$activity['goods'] = $builder->get()->toArray(); |
|
|
|
} |
|
|
|
|
|
|
|
return $activity; |
|
|
|
} |