Commit 10e622c5 authored by zhuwei's avatar zhuwei

bug

parent 6c96864d
......@@ -128,7 +128,7 @@ class PerformanceInfo extends Basic
public function getPerformanceInfoExcel()
{
$where['Obargain.status'] = ['neq',30];
$where['Obargain.status'] = ['in', '10,11,13'];
/*开始结束时间*/
if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
$where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];
......@@ -169,6 +169,7 @@ class PerformanceInfo extends Basic
}
$field = 'Obargain.create_time,';
$field .= 'Obargain.id,';
$field .= 'Obargain.trade_type,';
$field .= 'Houses.landmark,';
$field .= 'Oorder.house_id,';
......@@ -199,13 +200,19 @@ class PerformanceInfo extends Basic
}else{
$e_data_old['trade_type'] = "好处费";
}
/*o_partial_commission表查询实收数据 2018-10-10 10:35:42 朱伟*/
$m_commission = new OPartialCommission();
$return_ = $m_commission->getPracticalFee($v["id"]);
$practical_fee = $return_[0]['practical_fee'] ? $return_[0]['practical_fee'] : 0;//end
$e_data_old['landmark'] = $v['landmark'];//商铺地址
$e_data_old['house_id'] = $v['house_id'];//商铺编号
$e_data_old['name_phone'] = $v['name'].'-'.$v['phone'];//分佣提成方
$e_data_old['district_name'] = $v['district_name'].'-'.$v['store_name'];//所属部门
$e_data_old['scale'] = $v['scale'];//分佣比例
$e_data_old['scale_fee'] = $v['scale_fee'];//应收佣金
$e_data_old['practical_fee'] = $v['practical_fee'];//实收佣金
$e_data_old['practical_fee'] = $practical_fee;//实收佣金
$e_data_new[]=$e_data_old;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment