商铺同步修改

application/index/controller/OfficeBargain.php

@@ -778,7 +778,6 @@ class OfficeBargain extends Basic
         }
 
         if (!empty($content)) {
-            dump($father_id);die;
             $this->editRecordLog($father_id, '【编号:' . $father_id . '】'.$content);
         }
         /*记录日志 end*/

application/model/OBargainModel.php

@@ -1367,6 +1367,7 @@ class OBargainModel extends Model
                 ->field($filed)
                 ->alias("a")
                 ->join("o_partial_commission b", "a.id = b.bargain_id", "left")
+                ->join("o_real_income c", "b.real_income_id = c.id", "left")
                 ->where($where_)
                 ->whereOr($whereOr_)
                 ->order("a.id asc")
@@ -1631,6 +1632,24 @@ class OBargainModel extends Model
             ->select();
     }
 
+    /**
+     * @param $field
+     * @param $where
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function agentBargainIncome($field, $where) {
+        return $this->db_->alias('a')
+            ->field($field)
+            ->join('a_agents b', 'a.agent_id = b.id', 'left')
+            ->join('office_o_partial_commission c', 'a.id = c.bargain_id', 'left')
+            ->join('office_o_real_income d', 'c.real_income_id = d.id', 'left')
+            ->where($where)
+            ->select();
+    }
+
     /**
      * @param $field
      * @param $where