Commit a1520bfd authored by hujun's avatar hujun

father_id

parent 2dcbefc9
...@@ -3270,7 +3270,14 @@ class Finance extends Basic ...@@ -3270,7 +3270,14 @@ class Finance extends Basic
$result['adjustment'] = $this->numberTransitionString($result['adjustment']); $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
$result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']); $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
$bargain_id = $this->m_bargain->getFieldValue('id', ['order_id'=>$result['adjustment']['order_id']]); $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$result['adjustment'][0]['order_id']]);
if ($bargain_data['father_id'] > 0) {
$bargain_id = $bargain_data['father_id'];
} else {
$bargain_id = $bargain_data['id'];
}
$result['adjustment'][0]['bargain_id'] = empty($bargain_id) ? '':$bargain_id; $result['adjustment'][0]['bargain_id'] = empty($bargain_id) ? '':$bargain_id;
$result['money'] = $adjustment_data[0]['money']; $result['money'] = $adjustment_data[0]['money'];
$result['id'] = $adjustment_data[0]['id']; $result['id'] = $adjustment_data[0]['id'];
......
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