YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-12-29 15:26:20 +08:00
parent 32a8b351df 797c6c1e62
commit 81f44d4a81
4 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/adminapi/controller/User.php
View File

@@ -696,7 +696,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'];
}
@@ -709,13 +709,25 @@ class User extends adminApi
->where($where)
->where(['a.num'=>['>',0]])
->sum('a.num');
$gift_total = db::name('vs_user_gift_pack')
->alias('a')
// $gift_total = db::name('vs_user_gift_pack')
// ->alias('a')
// ->join('user b', 'a.user_id = b.id')
// ->join('vs_gift c', 'a.gid = c.gid')
// ->where($where)
// ->where(['a.num'=>['>',0]])
// ->sum('c.gift_price');
$listss = Db::name('vs_user_gift_pack')->alias('a')
->join('user b', 'a.user_id = b.id')
->join('vs_gift c', 'a.gid = c.gid')
->where($where)
->where(['a.num'=>['>',0]])
->sum('c.gift_price');
->field('a.num,c.gift_price')
->select();
foreach ($listss as $v) {
$gift_total += $v['num'] * $v['gift_price'];
}
$return_data = [
'page' =>$page,
'page_limit' => $page_limit,