diff --git a/.gitignore b/.gitignore index 4c69e5d5..36f7038e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cashregister /upload /runtime +/addon/fenxiao1 diff --git a/addon/futures/api/controller/Futures.php b/addon/futures/api/controller/Futures.php index af51f6c7..30299271 100644 --- a/addon/futures/api/controller/Futures.php +++ b/addon/futures/api/controller/Futures.php @@ -271,11 +271,12 @@ class Futures extends BaseApi{ $token = $this->checkToken(); if ($token['code'] < 0) return $this->response($token); + $id = input('id', 0); $futuresModel = new FuturesModel; $detail = $futuresModel->detail($id, $this->site_id); - if($detail['code'] < 0 || empty($detail['data']) || $detail['data']['seller_uid'] != $this->member_id){ + if($detail['code'] < 0 || empty($detail['data']) || !($detail['data']['seller_uid'] == $this->member_id || $detail['data']['member_id'] == $this->member_id)){ return $this->response($this->error('','订单不存在')); } return $this->response($detail); diff --git a/addon/futures/model/Futures.php b/addon/futures/model/Futures.php index e18be7fa..903d5c57 100644 --- a/addon/futures/model/Futures.php +++ b/addon/futures/model/Futures.php @@ -53,6 +53,7 @@ class Futures extends BaseModel{ 'a.real_income', 'a.site_id', 'a.seller_uid', + 'a.member_id', 'a.goods_id', 'a.id', 'a.total',