Commit 4128a9ab authored by hujun's avatar hujun

修改

parent 90bb6a44
...@@ -261,8 +261,6 @@ class Finance extends Basic ...@@ -261,8 +261,6 @@ class Finance extends Basic
if ($is_show) { if ($is_show) {
$data['data']['total_commission'] = $this->m_bargain->getBargainListSum('commission', $where); $data['data']['total_commission'] = $this->m_bargain->getBargainListSum('commission', $where);
$where['b.create_time'] = $where['a.create_time'];
unset($where['a.create_time']);
$data['data']['total_income_money'] = $m_real->getIncomeListSum('money', $where); $data['data']['total_income_money'] = $m_real->getIncomeListSum('money', $where);
} else { } else {
$data['data']['total_commission'] = 0; $data['data']['total_commission'] = 0;
......
...@@ -80,7 +80,6 @@ class ORealIncome extends BaseModel ...@@ -80,7 +80,6 @@ class ORealIncome extends BaseModel
->join('o_order c', 'a.order_id = c.id', 'left') ->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->where($params) ->where($params)
->group('a.id')
->sum($field); ->sum($field);
} }
} }
\ No newline at end of file
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