Commit 9a922800 authored by hujun's avatar hujun

分佣导出

parent 270f36b6
...@@ -812,7 +812,7 @@ class Finance extends Basic ...@@ -812,7 +812,7 @@ class Finance extends Basic
$where[] = [ 'EXP', 'b.id =' . $this->params['bargain_id'] . ' or father_id=' . $this->params['bargain_id'] ]; $where[] = [ 'EXP', 'b.id =' . $this->params['bargain_id'] . ' or father_id=' . $this->params['bargain_id'] ];
} }
$field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id'; $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id,a.should_commission';
$m_commission = new OPartialCommission(); $m_commission = new OPartialCommission();
try { try {
......
...@@ -122,13 +122,13 @@ class OPartialCommission extends BaseModel ...@@ -122,13 +122,13 @@ class OPartialCommission extends BaseModel
$result[$k]['district_store'] = $agent_data['store_name'] . '-' . $agent_data['store_name']; $result[$k]['district_store'] = $agent_data['store_name'] . '-' . $agent_data['store_name'];
$result[$k]['agent'] = $agent_data['name'] . '-' . $agent_data['phone']; $result[$k]['agent'] = $agent_data['name'] . '-' . $agent_data['phone'];
} }
$result[$k]['practical_fee'] = $v['practical_fee']; $result[$k]['should_commission'] = $v['should_commission'];
$result[$k]['scale_fee'] = $v['scale_fee']; $result[$k]['real_fee'] = $v['real_fee'];
$result[$k]['service_charge'] = $v['service_charge']; $result[$k]['service_charge'] = $v['service_charge'];
$result[$k]['charity_fund'] = $v['charity_fund']; $result[$k]['charity_fund'] = $v['charity_fund'];
$result[$k]['practical_fee'] = $v['practical_fee']; $result[$k]['practical_fee'] = $v['practical_fee'];
$result[$k]['cash'] = $v['cash']; $result[$k]['cash'] = $v['cash'];
$result[$k]['real_fee'] = $v['real_fee']; $result[$k]['practical_fee'] = $v['practical_fee'];
} }
return $result; return $result;
} }
......
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