Commit daad11c4 authored by hujun's avatar hujun

总计

parent 0104eae5
...@@ -3449,7 +3449,7 @@ class Finance extends Basic ...@@ -3449,7 +3449,7 @@ class Finance extends Basic
$data['total_custody_recorded'] = $data['custody_recorded'] - $data['custody_adjustment'] - $data['custody_refund']; //账上保管金 $data['total_custody_recorded'] = $data['custody_recorded'] - $data['custody_adjustment'] - $data['custody_refund']; //账上保管金
//待处理款项总计:未开业佣金+账上意向金+账上保管金 //待处理款项总计:未开业佣金+账上意向金+账上保管金
$data['wait_total_fee'] = $data['not_open_commission'] + $data['intention_recorded'] + $data['custody_recorded']; $data['wait_total_fee'] = $data['not_open_commission'] + $data['total_intention_recorded'] + $data['total_custody_recorded'];
return $this->response( 200, '', $data); return $this->response( 200, '', $data);
} }
...@@ -3462,10 +3462,8 @@ class Finance extends Basic ...@@ -3462,10 +3462,8 @@ class Finance extends Basic
*/ */
private function sumPayLogBargainByType($type, $is_open = 0) { private function sumPayLogBargainByType($type, $is_open = 0) {
$m_pay = new OPayLogModel(); $m_pay = new OPayLogModel();
if ($is_open) {
$where['b.is_open'] = $is_open;
}
$where['b.is_open'] = $is_open;
$where['a.type'] = $type; $where['a.type'] = $type;
$where['b.status'] = ['in', '10,11,13']; $where['b.status'] = ['in', '10,11,13'];
$where['b.father_id'] = 0; $where['b.father_id'] = 0;
......
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