1

application/model/OBargainModel.php

@@ -640,7 +640,7 @@ class OBargainModel extends Model
         if (isset($params["create_time"])) {
             $where_["c.income_time"] = $params["create_time"];
         }
-        $where_["a.status"] = array( "in", "10,11,13" );
+
         return Db::table($this->table)
             ->field($field)
             ->alias("a")
@@ -825,6 +825,45 @@ class OBargainModel extends Model
             ->select();
         return $return;
     }
+
+
+    public function getAddBargainNumV3($params, $type)
+    {
+        $where_ = [];
+        $field  = "";
+        $join   = [];
+        if ($type == 1) {
+            $field = "sum(scale_fee) as num";
+            $where_["a.status"] = array( "in", '10,11,13');
+        } elseif ($type == 2) {
+            $field = "sum(practical_fee) as num";
+        } elseif ($type == 3) {
+            $field                = "count(1) as num";
+            $where_["a.role"]       = 3;//必须是反签方1
+            $where_["a.status"] = array( "in", '10,11,13');
+        }
+
+        if (isset($params["agent_id"])) {
+            $where_["a.agent_id"] = $params["agent_id"];
+        }
+
+        if (isset($params["create_time"])) {
+            $where_["a.create_time"] = $params["create_time"];
+        }
+
+        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' ]);
+        }
+
+        $return = Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join($join)
+            ->where($where_)
+            ->select();
+        return $return;
+    }
     /**
      * @param $params
      * @return false|\PDOStatement|string|\think\Collection
@@ -1367,7 +1406,6 @@ 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")
@@ -1453,15 +1491,15 @@ class OBargainModel extends Model
             ->join("o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
             ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
-//            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
-//            ->join('a_district District', 'Agent.district_id = District.id', 'left')
+            //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
+            //            ->join('a_district District', 'Agent.district_id = District.id', 'left')
             ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
             ->where($where)
             ->order("Obargain.create_time desc")
             ->limit($pageSize)
             ->page($pageNo)
             ->select();
-            //echo $this->db_->getLastSql();
+        //echo $this->db_->getLastSql();
         return $result;
     }
 
@@ -1474,8 +1512,8 @@ class OBargainModel extends Model
             ->join("o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
             ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
-//            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
-//            ->join('a_district District', 'Agent.district_id = District.id', 'left')
+            //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
+            //            ->join('a_district District', 'Agent.district_id = District.id', 'left')
             ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
             ->where($where)
             ->order("Obargain.create_time desc")
@@ -1493,8 +1531,8 @@ class OBargainModel extends Model
             ->join("o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
             ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
-//            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
-//            ->join('a_district District', 'Agent.district_id = District.id', 'left')
+            //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
+            //            ->join('a_district District', 'Agent.district_id = District.id', 'left')
             ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
             ->where($where)
             ->order("Obargain.create_time desc")
@@ -1517,8 +1555,8 @@ class OBargainModel extends Model
             ->join("o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
             ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
-//            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
-//            ->join('a_district District', 'Agent.district_id = District.id', 'left')
+            //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
+            //            ->join('a_district District', 'Agent.district_id = District.id', 'left')
             ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
 
             ->where($where)
@@ -1588,7 +1626,7 @@ class OBargainModel extends Model
         //$where_["trade_type"] = 10;//产品要求统计数量必须是出租类型的180620
         $params["a.role"] = 3;//必须是反签方
         $params['c.shop_type'] = $type == 0 ? 0 : 1;
-//        dump($params);
+        //        dump($params);
         $return = Db::table($this->table)
             ->field($field)
             ->alias("a")
@@ -1632,24 +1670,6 @@ 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('o_partial_commission c', 'a.id = c.bargain_id', 'left')
-            ->join('o_real_income d', 'c.real_income_id = d.id', 'left')
-            ->where($where)
-            ->select();
-    }
-
     /**
      * @param $field
      * @param $where