Commit d1c82d4f authored by zhuwei's avatar zhuwei

bug

parent 2ab4168d
...@@ -48,6 +48,8 @@ class OPartialCommission extends BaseModel ...@@ -48,6 +48,8 @@ class OPartialCommission extends BaseModel
$m_real = new ORealIncome(); $m_real = new ORealIncome();
$fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name'; $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
//分佣ID
$data[$k]['commission_id'] = $v["bargain_id"] ;
if (isset($v['agent_id'])) { if (isset($v['agent_id'])) {
$agent_data = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]); $agent_data = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]);
$data[$k]['agent'] = $agent_data['name'] . '-' . $agent_data['phone']; $data[$k]['agent'] = $agent_data['name'] . '-' . $agent_data['phone'];
...@@ -57,8 +59,6 @@ class OPartialCommission extends BaseModel ...@@ -57,8 +59,6 @@ class OPartialCommission extends BaseModel
if ($v['father_id'] != 0) { if ($v['father_id'] != 0) {
$data[$k]['bargain_id'] = $v['father_id']; $data[$k]['bargain_id'] = $v['father_id'];
} }
//分佣ID
$data[$k]['commission_id'] = $v["id"] ;
} }
return $data; return $data;
} }
......
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