bug

application/api_broker/controller/Performance.php

@@ -47,12 +47,11 @@ class Performance extends Basic
             return $this->response("101", "请求参数错误");
         }
         //默认排序一周 2018-07-18改为本月
-        $end_day   = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", strtotime("+1 day"));
+        $end_day   = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
         $start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time());
 
 
-
-        $list      = $this->service_->totalAgent($params["agent_id"], $params["type"], $end_day, $start_day);
+        $list = $this->service_->totalAgent($params["agent_id"], $params["type"], $start_day, $end_day);
         if (count($list) > 0) {
             $result["list"]       = $list;
             $result["start_time"] = $start_day;
@@ -71,7 +70,7 @@ class Performance extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-/*        $params = array(
+        /*        $params = array(
                     "agent_id"   => 9,
                     "start_time" => "2018-06-20",
                     "end_time"   => "2018-06-20",

application/api_broker/service/PerformanceService.php

@@ -66,7 +66,7 @@ class PerformanceService
         }
 
         $where_                  = [];
-        $where_['a.create_time'] = array( 'between', array( $end_day, $yesterday ) );
+        $where_['a.create_time'] = array( 'between', array( $yesterday . " 00:00:00", $end_day . " 23:59:59" ) );
 
         $field  = "b.id as agent_id,b.store_id,b.district_id,sum(a.scale_fee) as performance_total";
         $order  = "performance_total desc";
@@ -126,7 +126,6 @@ class PerformanceService
     }
 
 
-
     /**
      * 个人业绩
      * @param $agent_id
@@ -450,9 +449,9 @@ class PerformanceService
 
         if (count($list) > 0) {
             foreach ($list as $key => $item) {
-                if($is_store == 2){
+                if ($is_store == 2) {
                     $fields = "a.name,b.store_name";
-                }else{
+                } else {
                     $fields = "c.name,b.store_name";
                 }
 
@@ -512,7 +511,7 @@ class PerformanceService
 
         //dump($payLogNum);
         // 监督
-        $result["supervision_num"] = $this->superviseModel->getSuperviseListCount( $params);
+        $result["supervision_num"] = $this->superviseModel->getSuperviseListCount($params);
 
         return $result;
     }