业绩明细加分佣ID

application/index/controller/PerformanceInfo.php

@@ -93,7 +93,6 @@ class PerformanceInfo extends Basic
             $field .= 'Obargain.agent_id,';//分佣方ID，前端做权限判断用
             $field .= 'Obargain.scale,';
             $field .= 'Obargain.scale_fee,';
-            $field .= 'Obargain.practical_fee,';
             $field .= 'Obargain.order_id,';
             $field .= 'Obargain.role,';
             $field .= 'Agent.name,';
@@ -101,14 +100,16 @@ class PerformanceInfo extends Basic
             $field .= 'Store.store_name,';
             $field .= 'District.district_name,';
             $field .= 'Houses.internal_address,';
+            $field .= 'PartialCommission.id as partial_commission_id,';
+            $field .= 'PartialCommission.practical_fee,';
             $field .= 'Oorder.house_id';
             $return  = $this->oBargainModel->performancelInfo($where,$field,$pageSize,$pageNo);
 
             /*o_partial_commission表查询实收数据 2018-10-10 10:35:42 朱伟*/
-            $m_commission = new OPartialCommission();
+            //$m_commission = new OPartialCommission();
             foreach ($return as $key => $val) {
-                $return_ = $m_commission->getPracticalFee($val["id"]);
-                $return[$key]['practical_fee']  = $return_[0]['practical_fee'] ? $return_[0]['practical_fee'] : 0;
+                //$return_ = $m_commission->getPracticalFee($val["id"]);
+                //$return[$key]['practical_fee']  = $return_[0]['practical_fee'] ? $return_[0]['practical_fee'] : 0;
                 //截取字符串前3位
                 $return[$key]['landmark']  = $val["internal_address"] ? mb_substr($val["internal_address"],0,3,'utf-8').'****' : '';
 

application/model/OBargainModel.php

@@ -1384,6 +1384,7 @@ class OBargainModel extends Model
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
             ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
             ->join('a_district District', 'Agent.district_id = District.id', 'left')
+            ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
             ->where($where)
             ->order("Obargain.create_time desc")
             ->limit($pageSize)