Commit 788134d1 authored by hujun's avatar hujun

成交报告-佣金提成修改

parent c4e2cc97
......@@ -1081,11 +1081,19 @@ class OBargainModel extends Model
}
}
$partial_commission = $m_partial->field('id,scale,practical_fee,cash,service_charge,charity_fund,real_fee,confirm_date,confirm_status,should_commission')
$partial_commission = $m_partial->field('id,scale,practical_fee,cash,service_charge,charity_fund,real_fee,confirm_date,confirm_status,should_commission,real_income_id')
->where('bargain_id', $v['id'])
->where('is_del', 0)
->order("id asc")
->select();
foreach ($partial_commission as $k2 => $v2) {
$income_time = $m_real->field('id,income_time')->find($v2['real_income_id']);
if (empty($income_time)) {
$partial_commission[$k2]['income_time'] = [];
} else {
$partial_commission[$k2]['income_time'] = $income_time;
}
}
//todo 最后一个分佣提成如果不为空则取其值
$i = count($partial_commission) - 1;
if ($partial_commission && $partial_commission[$i]["scale"] > 0) {
......@@ -1094,7 +1102,6 @@ class OBargainModel extends Model
}
$result[$k]["last_commission_id"] = $partial_commission[$i]["id"];
$result[$k]['partial_commission'] = $partial_commission;
$result[$k]['income_time'] = $m_real->field('id,income_time')->find($v['real_income_id']);
}
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