Commit 0560c436 authored by zhuwei's avatar zhuwei

成交报告详情-分佣提成 加分佣id

parent afd2b589
...@@ -477,6 +477,7 @@ class Finance extends Basic ...@@ -477,6 +477,7 @@ class Finance extends Basic
} else { } else {
$m_comm = new OBargainModel(); $m_comm = new OBargainModel();
$fields = 'a.id,a.role,a.agent_id,a.scale,a.scale_fee,a.father_id'; $fields = 'a.id,a.role,a.agent_id,a.scale,a.scale_fee,a.father_id';
$fields .= ',e.id as partial_commission_id';
$where[0] = [ 'EXP', "a.id = {$this->params['id']} or a.father_id = {$this->params['id']}" ]; $where[0] = [ 'EXP', "a.id = {$this->params['id']} or a.father_id = {$this->params['id']}" ];
$where['a.status'] = [ '<>', 30 ]; $where['a.status'] = [ '<>', 30 ];
$data['data'] = $m_comm->getBargainPartial(1, 100, 'a.id desc', $fields, $where, $this->params['id']); $data['data'] = $m_comm->getBargainPartial(1, 100, 'a.id desc', $fields, $where, $this->params['id']);
......
...@@ -1034,6 +1034,8 @@ class OBargainModel extends Model ...@@ -1034,6 +1034,8 @@ class OBargainModel extends Model
$data = $this->field($fields) $data = $this->field($fields)
->alias('a') ->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left') ->join('a_agents b', 'a.agent_id = b.id', 'left')
->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
->where($where) ->where($where)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
......
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