From ed7bb48158a69bfedf228702c7a056b9c747cd57 Mon Sep 17 00:00:00 2001 From: Hankin Date: Mon, 13 Apr 2026 16:25:08 +0800 Subject: [PATCH] activity --- app/Http/Controllers/Server/H5/ActivityController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Server/H5/ActivityController.php b/app/Http/Controllers/Server/H5/ActivityController.php index 07dbb4b..dd62932 100644 --- a/app/Http/Controllers/Server/H5/ActivityController.php +++ b/app/Http/Controllers/Server/H5/ActivityController.php @@ -709,7 +709,7 @@ class ActivityController extends Controller } } - function getUftxActivities(Request $request) + function getUftxActivities() { if (config('app.env') == 'production') { $merchant_id = 44; @@ -751,7 +751,7 @@ class ActivityController extends Controller ->where('community_activities.status', 1) ->where('merchant_services.type', 'community') ->where("start_time", ">", $time) - ->where('merchant_services.merchant_id', $request->merchant_id) + ->where('merchant_services.merchant_id', $merchant_id) ->orderBy('merchant_services.status', 'desc') ->orderBy('merchant_services.is_top', 'desc') ->orderBy('merchant_services.top_time', 'desc')