调整下单

modules/Mall/Http/Controllers/Api/ActivityController.php

@@ -3,10 +3,14 @@
 namespace Modules\Mall\Http\Controllers\Api;
 
 use App\Api\Controllers\Controller;
+use App\Api\Resources\User\UserBaseResource;
 use Illuminate\Http\JsonResponse;
+use Jason\Api\Api;
 use Modules\Mall\Http\Resources\Api\Activity\ActivityBaseResource;
 use Modules\Mall\Http\Resources\Api\Activity\ActivityResource;
+use Modules\Mall\Http\Resources\Api\Goods\GoodsBaseResource;
 use Modules\Mall\Models\Activity;
+use Modules\Mall\Models\Goods;
 
 class ActivityController extends Controller
 {
@@ -27,7 +31,26 @@ class ActivityController extends Controller
 
     public function show(Activity $activity)
     {
-        return $this->success(new ActivityResource($activity));
+        $show_goods_id = app('Conf_mall')['show_goods_id'] ?? 0;
+        $show_goods    = '';
+        if ($show_goods_id > 0) {
+            $show_goods = Goods::find($show_goods_id);
+        }
+
+        $goods = Goods::query()
+            ->where('id', '<>', $show_goods_id)
+            ->shown()
+            ->where('channel', Goods::CHANNEL_NORMAL)
+            ->get();
+
+
+        $user = Api::user();
+
+        return $this->success([
+            'user'       => $user ? new UserBaseResource($user) : '',
+            'show_goods' => $show_goods ? new GoodsBaseResource($show_goods) : '',
+            'activity'   => new ActivityResource($activity)
+        ]);
     }