diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index 4901abda..faa57150 100755 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -559,7 +559,14 @@ class Order extends BaseController 'user' => function ($query) { $query->field('uid,nickname,avatar'); }, - ]); + ])->join('product_order_log og', 'o.order_id = og.order_id') + ->where(function($query) { + if ($this->streetCode != '') { + $query->where('og.street_code', $this->streetCode); + } else { + $query->where('og.district_code', $this->areaCode); + } + }); $count = $query->count(); $list = $query->page($page, $limit)->select(); return app('json')->success(compact('count', 'list'));