diff --git a/admin/controllers/base/ChargeCashController.php b/admin/controllers/base/ChargeCashController.php index b80e898..af914bf 100644 --- a/admin/controllers/base/ChargeCashController.php +++ b/admin/controllers/base/ChargeCashController.php @@ -28,21 +28,10 @@ class ChargeCashController extends BaseAdminController $query->andWhere(['store_id' => $params['store_id']]); } -// if (!empty($params['start_time']) && !empty($params['end_time'])) { -// // 确保 start_time 不大于 end_time -// if ($params['start_time'] <= $params['end_time']) { -// $query->andWhere(['between', 'created_at', $params['start_time'], $params['end_time']]); -// } else { -// // 如果 start_time 大于 end_time,可以抛出异常或者记录错误 -// throw new \InvalidArgumentException("Start time must be before end time."); -// } -// } elseif (!empty($params['start_time'])) { -// // 只有开始时间的情况下,查询 created_at 大于等于 start_time 的数据 -// $query->andWhere(['>=', 'created_at', $params['start_time']]); -// } elseif (!empty($params['end_time'])) { -// // 只有结束时间的情况下,查询 created_at 小于等于 end_time 的数据 -// $query->andWhere(['<=', 'created_at', $params['end_time']]); -// } + if (!empty($params['start_time']) && !empty($params['end_time'])) { + + $query->andWhere(['between', 'created_at',$params['start_time'], $params['end_time']]); + } $query->with(['store'])->orderBy(['id' => SORT_DESC]);