server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
youda 2025-04-27 13:11:41 +08:00
parent c1cdc78079
commit c15e51a393
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/admin/controller/Order.php
View File

@ -723,10 +723,6 @@ class Order extends Base
exit;
}
/**
* 发货订单导出
*/
/**
* 发货订单导出
*/
@ -796,7 +792,8 @@ class Order extends Base
$user_info = 'ID：' . $value['user_id'] . " UID：" . ($value['user_info']['uid'] ?? $value['user_id']) . " 昵称：" . $value['user_info']['nickname'] . " 手机号：" . $value['user_info']['mobile'];
$addtime = date('Y-m-d H:i:s', $value['addtime']);
$goods = OrderList::where('send_num', $value['send_num'])
$goods = OrderList::field('*,count(`id`) as num')
->where('send_num', $value['send_num'])
->append(['shang_title', 'card_no'])
->group('prize_code')
->order('id desc')

10
app/admin/controller/Statistics.php
View File

@ -679,7 +679,9 @@ class Statistics extends Base
}
// 获取测试用户ID
$testUsers = User::where('istest', '>', 0)->column('id');
$testUsers = User::where('istest', '>', 0)
->whereOr('status', '=', 2)
->column('id');
$testUserIds = empty($testUsers) ? [0] : $testUsers;
// 获取盒子基本信息
@ -841,7 +843,7 @@ class Statistics extends Base
}
// 获取测试用户ID
$testUsers = User::where('istest', '>', 0)->column('id');
$testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id');
$testUserIds = empty($testUsers) ? [0] : $testUsers;
// 查询1：获取充值金额和余额消费总和
@ -958,7 +960,7 @@ class Statistics extends Base
}
// 获取测试用户ID
$testUsers = User::where('istest', '>', 0)->column('id');
$testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id');
$testUserIds = empty($testUsers) ? [0] : $testUsers;
// 获取盒子类型名称映射
@ -1276,7 +1278,7 @@ class Statistics extends Base
}
// 获取测试用户ID
$testUsers = User::where('istest', '>', 0)->column('id');
$testUsers = User::where('istest', '>', 0) ->whereOr('status', '=', 2)->column('id');
$testUserIds = empty($testUsers) ? [0] : $testUsers;
// 查询1：获取充值金额和余额消费总和