diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php index d4935492..aeeeb94d 100644 --- a/app/api/logic/LocalStoreLogic.php +++ b/app/api/logic/LocalStoreLogic.php @@ -274,34 +274,23 @@ class LocalStoreLogic extends Logic public function getLocalOrderList($data) { - $count = LocalStoreOrder::where(['lstore_id' => $data['lstore_id'], 'pay_shop_type' => 1, 'state' => 1])->count(); -// $count = Db::name("local_store_order") -// ->where("lstore_id",$data['lstore_id']) -// ->where("pay_shop_type",1) -// ->where('state',1) -// ->count(); -// $lists = $model->where('is_delete',0) -// ->where($s) -// ->page($data['page'], $data['size']) -// ->order('lstore_id desc') -// ->select(); -// $size = $data['page_size']; -// $page = ($data['page_no']-1)*$data['page_size']; -// $sql = "SELECT *, ST_Distance_Sphere(POINT(".$data['longitude'].",".$data['latitude']."),POINT(longitude, latitude)) AS distance -// FROM ls_local_store where is_delete = 0 $s -// ORDER BY distance limit $page,$size"; -// $sql = "SELECT * FROM ls_local_store_order where state = 1 and -// pay_shop_type = 1 and lstore_id = ".$data['lstore_id']." -// ORDER BY create_time desc limit ".$page.",".$size; + $where[] = []; + if (!empty($data['start_time']) && !empty($data['end_time']) ) { + $where[] = ['lso.create_time', '>=', $data['start_time']]; + $where[] = ['lso.create_time', '<=', $data['end_time']]; + } + + $count = LocalStoreOrder::where(['lstore_id' => $data['lstore_id'], 'pay_shop_type' => 1, 'state' => 1])->count(); -// $lists = Db::query($sql); $lists = LocalStoreOrder::alias('lso') ->field('lso.*, u.id, u.nickname') ->join('user u', 'lso.user_id = u.id') + ->where($where) ->where(['lso.state' => 1, 'lso.pay_shop_type' => 1, 'lso.lstore_id' => $data['lstore_id']]) ->order('lso.create_time desc') ->page($data['page_no'], $data['page_size']) ->select(); + $data = [ 'list' => $lists, 'page' => $data['page_no'], @@ -309,7 +298,7 @@ class LocalStoreLogic extends Logic 'count' => $count, 'more' => is_more($count, $data['page_no'], $data['page_size']) ]; -// var_dump($data); + return $data; }