From a504005c8fc440adb7c3720c1a2965ee6ec2f161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Sun, 12 Oct 2025 12:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82-=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82-=E5=A4=A9=E9=99=8D=E5=A5=BD=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Activities.php | 4 ++++
 application/common.php                    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php
index c9195d6..f8550ee 100644
--- a/application/api/controller/Activities.php
+++ b/application/api/controller/Activities.php
@@ -139,6 +139,10 @@ class Activities extends BaseCom
         $data['counter'] = $ext['counter'];
         $data['money'] = $ext['money_str'];
         $data['diamond'] = $ext['diamond'];
+        $data['effective_time'] = $ext['activity_end_time']??"";
+        if($ext['activity_end_time'] < time()){
+            return  V(0,'活动已结束！',null);
+        }
         $detail = DB::name('vs_gift_bag_detail')->where(['gift_bag_id'=>$gift_bag['id']])->select();
         $data['gift_list'] = [];
         foreach ($detail as $k=>$v){
diff --git a/application/common.php b/application/common.php
index 5dd7552..9870a13 100644
--- a/application/common.php
+++ b/application/common.php
@@ -1210,6 +1210,7 @@ function handelCharge($where,$data){
                 break;
             case 3:
                 //新人好礼
+                model('Activities')->new_charge_gift_send($orderModel['user_id'],$orderModel['money']);
         }
 
         return 1;