From 2989f039e818950e0c01ace0e2364ba7f66e5f00 Mon Sep 17 00:00:00 2001
From: Hankin <hankin_h@126.com>
Date: Tue, 28 Apr 2026 15:59:36 +0800
Subject: [PATCH] sign in

---
 .../Server/Admin/ActivityController.php          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Server/Admin/ActivityController.php b/app/Http/Controllers/Server/Admin/ActivityController.php
index 0d62d4b..7454cdf 100644
--- a/app/Http/Controllers/Server/Admin/ActivityController.php
+++ b/app/Http/Controllers/Server/Admin/ActivityController.php
@@ -2938,14 +2938,22 @@ class ActivityController extends Controller
             } else {
                 $apply_user = $query->paginate();
             }
+
+            $qrCode = QrCode::where("type", "community")->where("type_id", $activity_id)->first();
+
             foreach ($apply_user as $item) {
-                $sign = ActivityMeetingApply::where('activity_id', $activity_id)->where('mobile', $item->mobile)->first();
                 $item->is_sign = false;
                 $item->sign_time = '';
-                if (!empty($sign)) {
-                    $item->is_sign = true;
-                    $item->sign_time = $sign->created_at->toDateTimeString();
+                // $sign = ActivityMeetingApply::where('activity_id', $activity_id)->where('mobile', $item->mobile)->first();
+                if ($qrCode) {
+                    $sign = SignIn::where("qrcode_id", $qrCode->id)->where("merchant_user_id", $item->user_id)->first();
+
+                    if (!empty($sign)) {
+                        $item->is_sign = true;
+                        $item->sign_time = $sign->created_at->toDateTimeString();
+                    }
                 }
+
             }
             if ($is_export) {
                 return \Excel::download(new ActivityApplyUserExport($apply_user), 'activity_member.xlsx');