diff --git a/addon/fenxiao/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php index b71be8e9..f3eed28b 100644 --- a/addon/fenxiao/model/FenxiaoOrder.php +++ b/addon/fenxiao/model/FenxiaoOrder.php @@ -101,6 +101,7 @@ class FenxiaoOrder extends BaseModel model('fenxiao_order')->delete([ [ 'order_id', '=', $order[ 'order_id' ] ] ]); //获取分销等级 + $order['give_diamond'] = 0; foreach ($order_goods as $k => $v) { //商品信息管理 $goods_info = model("goods")->getInfo([ [ 'goods_id', '=', $v[ 'goods_id' ] ] ], 'is_fenxiao, fenxiao_type,give_diamond'); diff --git a/addon/futures/api/controller/Futures.php b/addon/futures/api/controller/Futures.php index 9729a2a8..433fe733 100644 --- a/addon/futures/api/controller/Futures.php +++ b/addon/futures/api/controller/Futures.php @@ -9,7 +9,16 @@ class Futures extends BaseApi{ * 列表 * @return false|string */ - public function page() + public function list() + { + return $this->response(); + } + + /** + * 列表 + * @return false|string + */ + public function myList() { return $this->response(); } @@ -20,6 +29,7 @@ class Futures extends BaseApi{ */ public function release() { + //TODO 身份验证,拆单 $id = input('id', 0); $price = input('price', 0); @@ -32,7 +42,7 @@ class Futures extends BaseApi{ * @return false|string */ public function stock(){ - + //TODO 身份验证 $id = input('id', 0); $futuresModel = new FuturesModel;