From d3e89e9af8e5c6b6b7e5953dfa664168a0917165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 10 Oct 2025 14:45:38 +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=E9=A6=96=E5=85=85?=
 =?UTF-8?q?=E5=A5=BD=E7=A4=BC=E8=B0=83=E6=95=B4-=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Activities.php |  9 ++++++---
 application/api/controller/Payment.php         |  7 ++++++-
 application/common.php                         | 12 +++++++++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/adminapi/controller/Activities.php b/application/adminapi/controller/Activities.php
index 73f2096..68b63a5 100644
--- a/application/adminapi/controller/Activities.php
+++ b/application/adminapi/controller/Activities.php
@@ -40,8 +40,9 @@ class Activities extends adminApi
     public function first_charge_lists(){
         $page = input('page', 1);
         $page_limit = input('page_limit', 30);
+        $activities_id = input('activities_id', 1);
         $where = [];
-        $where['activities_id'] = 1;
+        $where['activities_id'] = $activities_id;
         $where['delete_time'] = 0;
         $count = db($this->table)->where($where)->count();
         $lists = db($this->table)->where($where)->page($page, $page_limit)->select();
@@ -76,11 +77,12 @@ class Activities extends adminApi
         $title1 = input('title1', '');
         $title2 = input('title2', '');
         $money = input('money', '');
+        $activities_id = input('activities_id', 1);
         $return_data = [
             'name' => $name,
             'title' => $title,
             'status' => $status,
-            'activities_id' => 1,
+            'activities_id' => $activities_id,
         ];
         $ext = [
             'title1' => $title1,
@@ -167,11 +169,12 @@ class Activities extends adminApi
         $page_limit = input('page_limit', 30);
         $user_id = input('user_id', '');
         $gift_bag_id = input('gift_bag_id', '');
+        $activities_id = input('activities_id', 1);
         $where = [];
         if($user_id){
             $where['user_id'] = $user_id;
         }
-        $gift_bag = db('vs_gift_bag')->where(['activities_id'=>1,'delete_time'=>0])->select();
+        $gift_bag = db('vs_gift_bag')->where(['activities_id'=>$activities_id,'delete_time'=>0])->select();
 
         if($gift_bag_id){
             $where['gift_bag_id'] = $gift_bag_id;
diff --git a/application/api/controller/Payment.php b/application/api/controller/Payment.php
index b7b8984..f208d9a 100644
--- a/application/api/controller/Payment.php
+++ b/application/api/controller/Payment.php
@@ -26,6 +26,9 @@ class Payment extends Controller
         $user_id = input('user_id', 0);
         $money = input('money', 0);
         $coin = input('coin', 0);
+        $type_params = input('type_params', 0);
+        $type_id = input('type_id', 0);
+
         if(!$coin){
             $coin = $money * get_system_config_value('rmb_coin_ratio');
         }
@@ -60,7 +63,9 @@ class Payment extends Controller
         $data['user_id'] = $user_id;
         $data['pay_type'] = $type;
         $data['createtime'] = time();
-        $data['remarke'] = '充值到app用户'.($user_code ?? "") ."余额！";;
+        $data['remarke'] = '充值到app用户'.($user_code ?? "") ."余额！";
+        $data['type_params'] = $type_params;
+        $data['type_id'] = $type_id;
 
         $re = db::name('vs_user_recharge')->insert($data);
         if (!$re) {
diff --git a/application/common.php b/application/common.php
index 145e198..5dd7552 100644
--- a/application/common.php
+++ b/application/common.php
@@ -1198,13 +1198,19 @@ function handelCharge($where,$data){
         }
         db::commit();
 
+        //活动
         //首充
         if($is_first_charge == 0){
             model('Activities')->first_charge_gift_send($orderModel['user_id'],$orderModel['money']);
         }
-        //天降好礼
-        model('Activities')->drop_gift_send($orderModel['user_id'],$orderModel['money']);
-
+        switch ($orderModel['type_params']){
+            case 2:
+                //天降好礼
+                model('Activities')->drop_gift_send($orderModel['user_id'],$orderModel['money']);
+                break;
+            case 3:
+                //新人好礼
+        }
 
         return 1;
     } catch (\Exception $e){