Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

application/api/controller/Order.php

@@ -78,6 +78,7 @@ class Order extends Api
             $where[$o.'.company_id'] = $this->auth->company_id;
             $where[$o.'.ordertype'] = 3;//类型:1=预约下单,2=在线下单,3=套餐订单
             $where[$o.'.status'] = ['in',[1,2,3]];//状态:2=待处理,3=已完成,4=已取消
+            $where[$p.'.type'] = 1;//类型:1=普通,2=卡券
             if (!empty($status)) {
                 if ($status == 1) {
                     $where[$o.'.hexiao_time'] = 0;