实收列表

application/api_broker/controller/Performance.php

@@ -361,14 +361,14 @@ class Performance extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-     /*          $params = array(
-                   "type"       => 1, //1个人，2经纪人
-                   "agent_id"   => 80,
-                   "start_time" => "2018-06-12",
-                   "end_time"   => "2018-06-19",
-                   "page_no"    => 1,
-                   "page_size"  => 15
-               );*/
+        /*          $params = array(
+                      "type"       => 1, //1个人，2经纪人
+                      "agent_id"   => 80,
+                      "start_time" => "2018-06-12",
+                      "end_time"   => "2018-06-19",
+                      "page_no"    => 1,
+                      "page_size"  => 15
+                  );*/
 
         $checkResult = $this->validate($params, "PerformanceValidate.verify");
         if (true !== $checkResult) {
@@ -381,7 +381,7 @@ class Performance extends Basic
         $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
         $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
 
-        $result = $this->service_->performanceList($params["type"],$params["agent_id"], $start_day, $end_day, $page_no, $page_size);
+        $result = $this->service_->performanceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
         if ($result["code"] == 101) {
             return $this->response("101", $result["date"]);
         } else {
@@ -432,14 +432,14 @@ class Performance extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-        /*          $params = array(
-                      "type"       => 1, //1个人，2经纪人
-                      "agent_id"   => 80,
-                      "start_time" => "2018-06-12",
-                      "end_time"   => "2018-06-19",
-                      "page_no"    => 1,
-                      "page_size"  => 15
-                  );*/
+        /* $params = array(
+             "type"       => 1, //1个人，2经纪人
+             "agent_id"   => 80,
+             "start_time" => "2018-06-12",
+             "end_time"   => "2018-06-19",
+             "page_no"    => 1,
+             "page_size"  => 15
+         );*/
 
         $checkResult = $this->validate($params, "PerformanceValidate.verify");
         if (true !== $checkResult) {
@@ -452,7 +452,7 @@ class Performance extends Basic
         $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
         $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
 
-        $result = $this->service_->officialReceipts($params["type"],$params["agent_id"], $start_day, $end_day, $page_no, $page_size);
+        $result = $this->service_->officialReceipts($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
         if ($result["code"] == 101) {
             return $this->response("101", $result["date"]);
         } else {

application/api_broker/service/PerformanceService.php

@@ -741,7 +741,7 @@ class PerformanceService
         $params = $this->getAgentId($agent_id, $type, $start_time, $end_time);
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
-        $field = "a.id,c.name,d.store_name,e.district_name,a.practical_fee,a.create_time";
+        $field = "a.id,c.name,d.store_name,e.district_name,b.practical_fee,b.create_time";
 
         $where_["a.agent_id"]    = $params["agent_id"];
         $where_["a.create_time"] = $params["create_time"];

application/model/OBargainModel.php

@@ -683,11 +683,12 @@ class OBargainModel extends Model
             ->join("o_partial_commission b", "a.id=b.bargain_id", "right")
             ->join("a_agents c", "a.agent_id=c.id", "left")
             ->join("a_store d", "c.store_id=d.id", "left")
-            ->join("a_district e", "c.district_id=c.id", "left")
+            ->join("a_district e", "c.district_id=e.id", "left")
             ->where($where_)
             ->page($page_no)
             ->limit($page_size)
             ->select();
+       // echo $this->getLastSql();
         return $date;
 
     }