root / jysh · 提交

转到一个项目

作者 王晓刚
提交 8feaced88fe1a25426d34f65c703bc28aae48cbc 1 个父辈 8e9c02da
1 个管道 的构建 通过 耗费 0 秒

下单成功弹出海报

内嵌 并排对比
正在显示 1 个修改的文件 包含 6 行增加 和 6 行删除
... ... @@ -24,13 +24,13 @@ class OrderController extends AdminBaseController
$startTime = empty($param['start_time']) ? 0 : strtotime($param['start_time']);
$endTime = empty($param['end_time']) ? 0 : strtotime($param['end_time']);
if (!empty($startTime) && !empty($endTime)) {
$where['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
$where['get_time'] = [['>= time', $startTime], ['<= time', $endTime]];
} else {
if (!empty($startTime)) {
$where['create_time'] = ['>= time', $startTime];
$where['get_time'] = ['>= time', $startTime];
}
if (!empty($endTime)) {
$where['create_time'] = ['<= time', $endTime];
$where['get_time'] = ['<= time', $endTime];
}
}
$startTime1 = empty($param['start_time1']) ? 0 : strtotime($param['start_time1']);
... ... @@ -325,13 +325,13 @@ class OrderController extends AdminBaseController
$startTime = empty($param['start_time']) ? 0 : strtotime($param['start_time']);
$endTime = empty($param['end_time']) ? 0 : strtotime($param['end_time']);
if (!empty($startTime) && !empty($endTime)) {
$where['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
$where['get_time'] = [['>= time', $startTime], ['<= time', $endTime]];
} else {
if (!empty($startTime)) {
$where['create_time'] = ['>= time', $startTime];
$where['get_time'] = ['>= time', $startTime];
}
if (!empty($endTime)) {
$where['create_time'] = ['<= time', $endTime];
$where['get_time'] = ['<= time', $endTime];
}
}
$startTime1 = empty($param['start_time1']) ? 0 : strtotime($param['start_time1']);
... ...