|
@@ -26,6 +26,7 @@ class OrderService
|
|
*/
|
|
*/
|
|
public static function getOrderList(array $param, $isAll = false)
|
|
public static function getOrderList(array $param, $isAll = false)
|
|
{
|
|
{
|
|
|
|
+ print_sql();
|
|
$sql = self::getOrderQuerySql($param);
|
|
$sql = self::getOrderQuerySql($param);
|
|
|
|
|
|
if ($isAll) {
|
|
if ($isAll) {
|
|
@@ -129,18 +130,18 @@ class OrderService
|
|
}
|
|
}
|
|
// 支付时间
|
|
// 支付时间
|
|
if (!empty(getProp($param, 'pay_end_at_start'))) {
|
|
if (!empty(getProp($param, 'pay_end_at_start'))) {
|
|
- $sql->where('pay_end_at', $param['pay_end_at_start']);
|
|
|
|
|
|
+ $sql->where('pay_end_at', ">=",$param['pay_end_at_start']);
|
|
}
|
|
}
|
|
if (!empty(getProp($param, 'pay_end_at_end'))) {
|
|
if (!empty(getProp($param, 'pay_end_at_end'))) {
|
|
$end =$param['pay_end_at_end'];
|
|
$end =$param['pay_end_at_end'];
|
|
if ($end == getProp($param,'pay_end_at_start','')){
|
|
if ($end == getProp($param,'pay_end_at_start','')){
|
|
$end = date("Y-m-d",strtotime($end)) . " 23:59:59";
|
|
$end = date("Y-m-d",strtotime($end)) . " 23:59:59";
|
|
}
|
|
}
|
|
- $sql->where('pay_end_at', "<=", $param['pay_end_at_end']);
|
|
|
|
|
|
+ $sql->where('pay_end_at', "<=", $end);
|
|
}
|
|
}
|
|
// 创建时间
|
|
// 创建时间
|
|
if (!empty(getProp($param, 'created_at_start'))) {
|
|
if (!empty(getProp($param, 'created_at_start'))) {
|
|
- $sql->where('created_at', $param['created_at_start']);
|
|
|
|
|
|
+ $sql->where('created_at', '>=',$param['created_at_start']);
|
|
}
|
|
}
|
|
|
|
|
|
if (!empty(getProp($param, 'created_at_end'))) {
|
|
if (!empty(getProp($param, 'created_at_end'))) {
|