bug

application/model/OBargainModel.php

@@ -642,7 +642,7 @@ class OBargainModel extends Model
         } elseif ($type == 2) {
             $field = "sum(practical_fee) as num,DATE(create_time) as day";
         } elseif ($type == 3) {
-            $field                = "count(1) as num,DATE(create_time) as day";
+            $field = "count(1) as num,DATE(create_time) as day";
             //$where_["father_id"]  = 0;
             $where_["trade_type"] = 10;//产品要求统计数量必须是出租类型的180620
         }
@@ -671,7 +671,7 @@ class OBargainModel extends Model
     {
         $where_ = [];
         $field  = "";
-        $join = [];
+        $join   = [];
         if ($type == 1) {
             $field = "sum(scale_fee) as num";
         } elseif ($type == 2) {
@@ -681,7 +681,7 @@ class OBargainModel extends Model
             $where_["a.trade_type"] = 10;
             //$where_["a.father_id"]  = 0;
 
-            array_push($join,[' o_report c','a.report_id=c.id','left']);
+            array_push($join, [ ' o_report c', 'a.report_id=c.id', 'left' ]);
         }
 
 
@@ -698,7 +698,7 @@ class OBargainModel extends Model
 
         if (isset($params["house_ids"])) {
             $where_["b.house_id"] = array( "in", $params["house_ids"] );
-            array_push($join,[' o_order b','a.order_id = b.id','left']);
+            array_push($join, [ ' o_order b', 'a.order_id = b.id', 'left' ]);
         }
 
         $return = Db::table($this->table)
@@ -793,6 +793,7 @@ class OBargainModel extends Model
 
         if (isset($params["agent_id"])) {
             $where_["c.report_agent_id"] = $params["agent_id"];
+            $where_["a.agent_id"]        = $params["agent_id"];
         }
         if (isset($params["create_time"])) {
             $where_["a.create_time"] = $params["create_time"];
@@ -1197,7 +1198,7 @@ class OBargainModel extends Model
      * @param string $order
      * @return false|\PDOStatement|string|\think\Collection
      */
-    public function getTotalByAgentId($field ,$params, $type ,$order = "")
+    public function getTotalByAgentId($field, $params, $type, $order = "")
     {
         $group_ = "";
         switch ($type) {
@@ -1215,12 +1216,12 @@ class OBargainModel extends Model
         $result = $this->db_
             ->field($field)
             ->alias("a")
-            ->join("a_agents b","a.agent_id = b.id","left")
+            ->join("a_agents b", "a.agent_id = b.id", "left")
             ->where($params)
             ->group($group_)
             ->order($order)
             ->select();
-       // echo $this->db_->getLastSql();
+        // echo $this->db_->getLastSql();
         return $result;
 
     }