Wesmiler

app/Services/Api/MeetingService.php

@@ -177,7 +177,6 @@ class MeetingService extends BaseService
             });
     }
 
-
     /**
      * 签到
      * @param $userId
@@ -223,6 +222,16 @@ class MeetingService extends BaseService
             return false;
         }
 
+        $otherRecord = MeetingRecordsModel::with(['meeting'])->where(['user_id'=>$userId,'mark'=>1])->first();
+        $meeting = isset($otherRecord['meeting'])?$otherRecord['meeting']:[];
+        $meetingStartAt = isset($meeting['start_at'])?$meeting['start_at'] : '';
+        $meetingEndAt = isset($meeting['end_at'])?$meeting['end_at'] : '';
+        if($otherRecord && $meetingStartAt <= $nowDate && $nowDate <= $meetingEndAt){
+            RedisService::clear($cacheKey);
+            $this->error = '您有未完成的会议，请完成后再签到';
+            return false;
+        }
+
         $data = [
             'user_id' => $userId,
             'meeting_id' => $meetingId,

app/Services/Api/OrderService.php

@@ -14,6 +14,7 @@ namespace App\Services\Api;
 use App\Models\CartModel;
 use App\Models\GoodsModel;
 use App\Models\GoodsSkuModel;
+use App\Models\MeetingRecordsModel;
 use App\Models\MemberModel;
 use App\Models\OrderGoodsModel;
 use App\Models\OrderModel;
@@ -286,6 +287,8 @@ class OrderService extends BaseService
             $orderTotal = 0.1;
         }
 
+        // 检查是否关联为会议订单
+
         // 订单数据
         $order = [
             'order_no' => $orderNo,