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

Merge branch 'dev'

Browse Source
This commit is contained in:
zpc 2025-05-18 13:39:42 +08:00
commit c71afca0e0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1281,14 +1281,13 @@ class Order extends Base
if ($u_status !== '') { if ($u_status !== '') {
$where[] = ['u.status', '=', $u_status]; $where[] = ['u.status', '=', $u_status];
} }
if ($start_time) {
if ($start_time && $end_time) {
$where[] = ['o.addtime', 'between', [$start_time, $end_time]];
} else if ($start_time) {
$where[] = ['o.addtime', '>=', $start_time]; $where[] = ['o.addtime', '>=', $start_time];
} else if ($end_time) { }
if ($end_time) {
$where[] = ['o.addtime', '<=', $end_time]; $where[] = ['o.addtime', '<=', $end_time];
} }
$query = Db::table('order') $query = Db::table('order')
->alias('o') ->alias('o')