Commit 90407dc2 authored by clone's avatar clone

bug

parent 69780c3f
...@@ -37,7 +37,6 @@ class OPartialCommission extends BaseModel ...@@ -37,7 +37,6 @@ class OPartialCommission extends BaseModel
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
$result = []; $result = [];
$m_agent = new AAgents(); $m_agent = new AAgents();
...@@ -128,6 +127,7 @@ class OPartialCommission extends BaseModel ...@@ -128,6 +127,7 @@ class OPartialCommission extends BaseModel
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
->join('o_order c', 'b.order_id = c.id', 'left') ->join('o_order c', 'b.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')
->join('a_agents e', 'b.agent_id = e.id','left')
->where($where) ->where($where)
->count(); ->count();
} }
......
...@@ -209,13 +209,14 @@ class OTaxes extends BaseModel ...@@ -209,13 +209,14 @@ class OTaxes extends BaseModel
*/ */
public function getTaxesListTotal($params) public function getTaxesListTotal($params)
{ {
return $this->alias('a') $data = $this->alias('a')
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
->join('o_order c', 'b.order_id = c.id', 'left') ->join('o_order c', 'b.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')
->join('a_agents e', 'b.agent_id = e.id', 'left') ->join('a_agents e', 'b.agent_id = e.id', 'left')
->where($params) ->where($params)
->count(); ->sum("a.fee");
return $data;
} }
/** /**
......
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