Commit b306294c authored by hujun's avatar hujun

where

parent e60a3fd3
......@@ -1574,7 +1574,7 @@ class Finance extends Basic
/**经纪人手机号**/
if (!empty($this->params['agent_id'])) {
$taxes_where['c.agent_id'] = $taxes_where['a.agent_id'] = $this->params['agent_id'];
$taxes_where['b.agent_id'] = $where['a.agent_id'] = $this->params['agent_id'];
}
$fields = 'sum( a.practical_fee ) as practical_fee,sum( a.real_fee ) as real_fee,';
......@@ -1589,6 +1589,7 @@ class Finance extends Basic
$taxes_where['a.is_del'] = 0;
// $taxes_where['b.status'] = ['IN', '10,11,13'];
$taxes_where['a.operation_date'] = ['between', [$operation_start_data, $operation_end_data]];
$data['data']['total_taxes'] = $m_tax->sumBargainFee('a.fee', $taxes_where);;
if (!empty($this->params['confirm_date'])) {
......@@ -1602,6 +1603,8 @@ class Finance extends Basic
$list[$k]['operation_date'] = $operation_date;
$list[$k]['district_store'] = $m_store->getStoreDistrictName($v['store_id']);
$list[$k]['fee'] = empty($v['fee']) ? 0 : $v['fee'];
$list[$k]['service_charge'] = empty($v['service_charge']) ? 0 : $v['service_charge'];
$list[$k]['charity_fund'] = empty($v['charity_fund']) ? 0 : $v['charity_fund'];
}
$data['data']['list'] = $list;
......
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