成交报告详情增加业态和成交价

application/index/controller/Finance.php

@@ -196,7 +196,7 @@ class Finance extends Basic
         } else {
             $bargain       = new OBargainModel();
             $fields        = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,';
-            $fields        .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type';
+            $fields        .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price';
             $where['a.id'] = $this->params['id'];
             $data['data']  = $bargain->getBargainInfo($fields, $where);
         }
@@ -989,9 +989,9 @@ class Finance extends Basic
         $pageSize     = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
         $where['c.is_del'] = 0;        //订单状态
-//        $where['a.status']       = ['in', '10,11'];   //10已提交 11审核成功
+        $where['a.status']       = ['in', '10,11'];   //10已提交 11审核成功
         $where['b.father_id']    = ['<>', 0];  //去除税费总佣金
-//        $where['c.confirm_status'] = 1;   //确认分佣
+        $where['c.confirm_status'] = 1;   //确认分佣
 
         $month_start = date('Y-m-01');
         $month_end = date('Y-m-t');