分佣提成明细表修改

application/model/OPartialCommission.php

@@ -36,7 +36,7 @@ class OPartialCommission extends BaseModel
             ->join('o_order c', 'b.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('a_agents e', 'b.agent_id = e.id', 'left')
-            ->join('o_real_income f', 'b.id = f.bargain_id', 'left')
+            ->join('o_real_income f', 'a.real_income_id = f.id', 'left')
             ->where($where)
             ->order($order_)
             ->limit($pageSize)
@@ -144,7 +144,7 @@ class OPartialCommission extends BaseModel
             ->join('o_order c', 'b.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('a_agents e', 'b.agent_id = e.id', 'left')
-            ->join('o_real_income f', 'f.bargain_id = f.id', 'left')
+            ->join('o_real_income f', 'a.real_income_id = f.id', 'left')
             ->where($where)
             ->count();
     }
@@ -153,7 +153,8 @@ class OPartialCommission extends BaseModel
      * 增加和编辑实收佣金
      *
      * @param $data
-     * @return int|string
+     * @return array|false
+     * @throws \Exception
      */
     public function addCommission($data)
     {