From 27ea2ff4231f51a55957ff910dd48ae2a0cc980e Mon Sep 17 00:00:00 2001 From: nizongfeng Date: Wed, 24 Nov 2021 10:03:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/service/PaymentOrderService.php | 10 +++++----- application/admin/service/ReceiptOrderService.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/admin/service/PaymentOrderService.php b/application/admin/service/PaymentOrderService.php index 9ba4429..556a3e7 100644 --- a/application/admin/service/PaymentOrderService.php +++ b/application/admin/service/PaymentOrderService.php @@ -179,7 +179,7 @@ class PaymentOrderService $item_where_arr[] = " a.item_id = {$param["item_id"]} "; } if (!empty($param['hotel_id'])) { - $item_where_arr[] = " a.hotel_id = {$param["hotel_id"]} "; + $hotel_where_arr[] = " b.hotel_id = {$param["hotel_id"]} "; } switch ($param['inPayment']) { @@ -208,12 +208,12 @@ class PaymentOrderService //时间区间查询 if (!empty($param['startTime']) ) { - $item_where_arr[] = " a.create_time >= {$param["startTime"]} 00:00:00 "; - $hotel_where_arr[]=" b.create_time >= {$param['startTime']} 00:00:00 "; + $item_where_arr[] = " a.create_time >= '{$param["startTime"]} 00:00:00' "; + $hotel_where_arr[]=" b.create_time >= '{$param['startTime']} 00:00:00' "; } if (!empty($param['endTime'])) { - $item_where_arr[] = " a.create_time <= {$param["endTime"]} 23:59:59 "; - $hotel_where_arr[]=" b.create_time <= {$param['endTime']} 23:59:59 "; + $item_where_arr[] = " a.create_time <= '{$param["endTime"]} 23:59:59' "; + $hotel_where_arr[]=" b.create_time <= '{$param['endTime']} 23:59:59' "; } return $dao->getSubOrderListByWhere(join(" and ",$hotel_where_arr),join(" and ",$item_where_arr),join(" and ",$where_arr),$param); diff --git a/application/admin/service/ReceiptOrderService.php b/application/admin/service/ReceiptOrderService.php index 2aaaa1b..4def5d1 100644 --- a/application/admin/service/ReceiptOrderService.php +++ b/application/admin/service/ReceiptOrderService.php @@ -121,7 +121,7 @@ class ReceiptOrderService $orderMainDao = new OrderMainDao(); $where = ["id"=>["neq",""]]; if (!empty($param['order_id'])) { - $where["order"]=$param['order_id']; + $where["id"]=$param['order_id']; } if (!empty($param['channel_id'])) { $where['channel_id'] = $param['channel_id'];