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;