Commit e63cd066 authored by hujun's avatar hujun

$bargain_id

parent 4161d8a3
......@@ -2423,8 +2423,12 @@ class Finance extends Basic
}
if ($v['type'] != 10 && $v['type'] != 30) {
$bargain_id = $this->m_bargain->selectBargainByOrderNo('id', ['order_id'=>$v['order_id']]);
$list[$k]['bargain_id'] = $bargain_id[0]['id'];
$bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$v['order_id']]);
$bargain_id = $bargain_data['id'];
if ($bargain_data['father_id'] != 0) {
$bargain_id = $bargain_data['father_id'];
}
$list[$k]['bargain_id'] = empty($bargain_id)? '':$bargain_id;
} else {
$list[$k]['bargain_id'] = '';
}
......@@ -2748,7 +2752,7 @@ class Finance extends Basic
if ($bargain_data['father_id'] != 0) {
$bargain_id = $bargain_data['father_id'];
}
$pay_data['bargain_id'] = $bargain_id;
$pay_data['bargain_id'] = empty($bargain_id)? '':$bargain_id;
$pay_data['is_open'] = empty($bargain_data['is_open']) ? 0 :$bargain_data['is_open'];
$pay_data['price'] = empty($bargain_data['price'])? 0:$bargain_data['price'];
......
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