1

application/api_broker/controller/Statement.php

@@ -248,13 +248,13 @@ class Statement extends Basic
         $field = "id,store_id,district_id,level,name,phone,sex,status";
         $agentModel = new AAgents();
         $agent_result = $agentModel->getAgentById($field, [ "agent_id" => $params["agent_id"] ]);
+
         if(!$agent_result){
             return $this->response("200", "request is null");
         }
 
         $store_id = $agent_result[0]["store_id"];
         $district_id = $agent_result[0]["district_id"];
-
         switch ($agent_result[0]["level"]) {
             case 10:
                 #业务员

application/api_broker/service/StatementService.php

@@ -31,6 +31,7 @@ class StatementService
     private $reportModel;
     private $marchInModel;
     private $bargainModel;
+    private $partialCommission;
 
     const USER_LEVEL_FIST = 0; //经纪人
     const USER_LEVEL_SECOND = 1; //店长
@@ -46,6 +47,7 @@ class StatementService
         $this->reportModel = new OReportModel();
         $this->marchInModel = new OMarchInModel();
         $this->bargainModel = new OBargainModel();
+        $this->partialCommission = new OPartialCommission();
 
     }
 
@@ -183,8 +185,7 @@ class StatementService
         $performanceSum              = $this->bargainModel->getAddBargainNum($where_, 1);//1表示业绩 2表示实收
         $result["performance_month"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
 
-        $m_partial  = new OPartialCommission();
-        $real_performanceSum              = $m_partial->getReceived($where_);
+        $real_performanceSum              = $this->partialCommission->getReceived($where_);
         $result["real_performance_month"] = isset($real_performanceSum[0]["num"]) ? $real_performanceSum[0]["num"] : 0;
 
         //本周业绩
@@ -809,7 +810,7 @@ class StatementService
      */
     public function selectStatementForDistrictWithDay($agent_level, $district_id)
     {
-        $agent_res = $this->getAgentIDsByDistrictId($district_id,$agent_level);
+        $agent_res = $this->getAgentIDsByDistrictId($district_id, $agent_level, 0);
         $conditions['agent_id'] = array( "in", $agent_res['agent_ids'] );
 
         ############################## 本月数据 ###############################################
@@ -820,14 +821,14 @@ class StatementService
         $performanceSum = $this->bargainModel->getAddBargainNumV3($conditions, 1);//1表示业绩 2表示实收
         $result["district_month_performance"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
         // 实收
-        $performanceSum = $this->bargainModel->getAddBargainNum($conditions, 2);//1表示业绩 2表示实收
-        $result["district_month_real_performance"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
+        $real_performanceSum = $this->partialCommission->getReceived($conditions);
+        $result["district_month_real_performance"] = isset($real_performanceSum[0]["num"]) ? $real_performanceSum[0]["num"] : 0;
         // 本月-成交单数
         $performanceSum = $this->bargainModel->getAddBargainNumV2($conditions, 3);//1表示业绩 2表示实收
         $result["district_month_bargain_sum"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
 
         //人数
-        $agent_res = $this->getAgentIDsByDistrictId($district_id,$agent_level,1);
+        $agent_res = $this->getAgentIDsByDistrictId($district_id, $agent_level, 1);
         $result["district_team_num"] = $agent_res['store_list_num'];
         return $result;
     }

application/model/OBargainModel.php

@@ -839,7 +839,7 @@ class OBargainModel extends Model
             $field = "sum(practical_fee) as num";
         } elseif ($type == 3) {
             $field                = "count(1) as num";
-            $where_["a.role"]       = 3;//必须是反签方
+            $where_["a.role"]       = 3;//必须是反签方1
             $where_["a.status"] = array( "in", '10,11,13');
         }
 

application/model/OfficeGRoom.php

@@ -360,7 +360,6 @@ class OfficeGRoom extends BaseModel
     public function getRoomNum($params)
     {
         $result = $this->where($params)->count();
-        big_log($this->getLastSql());
         return $result;
     }