From 6cde21fe2d052aa98470db4ef5c2c38d2c80368d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 29 Dec 2025 12:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=83=8C=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/User.php |  2 +-
 application/api/controller/Xxiaoshi.php  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/application/adminapi/controller/User.php b/application/adminapi/controller/User.php
index 0c3dd88b..88dd02a0 100644
--- a/application/adminapi/controller/User.php
+++ b/application/adminapi/controller/User.php
@@ -698,7 +698,7 @@ class User extends adminApi
         $gift_total = 0;
         $gift_count = 0;
         foreach ($list as $key => &$value) {
-            $value['createtime'] = date('Y-m-d H:i:s',$value['createtime']);
+            $value['createtime'] = date('Y-m-d H:i:s',$value['updatetime']);
             $value['nickname'] = $value['nickname'].'-'.$value['user_code'];
             $value['gift_id_name'] = $value['gift_name'].'-'.$value['gid'];
         }
diff --git a/application/api/controller/Xxiaoshi.php b/application/api/controller/Xxiaoshi.php
index 88ee29a0..8de32bd5 100644
--- a/application/api/controller/Xxiaoshi.php
+++ b/application/api/controller/Xxiaoshi.php
@@ -27,4 +27,22 @@ class Xxiaoshi extends Controllers
         }
     }
 
+
+    //测试数据
+    public function testData()
+    {
+        $res = db::name('vs_user_gift_pack_log')->alias('a')
+            ->join('user b','a.user_id = b.id')
+            ->field('a.gid,b.nickname,a.user_id,a.gid')
+            ->where(['updatetime'=> ['<=', 1766332800]])->group('user_id')->select();
+        $total_price = 0;
+        if($res){
+            foreach ($res as $v){
+                $gft_price = db::name('vs_gift')->where('gid',$v['gid'])->value('gift_price');
+                $total_price += $gft_price * $v['after_num'];
+            }
+        }
+        echo $total_price;
+    }
+
 }
\ No newline at end of file