bug

application/index/controller/Performance.php

@@ -114,8 +114,6 @@ class Performance extends Basic
         $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());
         $father_id              = !empty($params["father_id"]) ? $params["father_id"] : '' ;
-
-
         $list = $this->service_->totalAgent($params["type"], $end_day, $start_day,$pageNo,$pageSize,$father_id);
         if (count($list) > 0) {
             $result["list"]       = $list['list'];

application/index/controller/PerformanceInfo.php

@@ -32,7 +32,7 @@ class PerformanceInfo extends Basic
             $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
             $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
-            $where=[];
+            $where['Obargain.status'] = ['neq',30];
             /*开始结束时间*/
             if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
                 $where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];

application/index/service/PerformanceService.php

@@ -51,10 +51,9 @@ class PerformanceService
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function totalAgent($type, $yesterday, $end_day,$father_id)
+    public function totalAgent($type, $yesterday, $end_day,$pageNo,$pageSize,$father_id)
     {
         $where_ = [];
-        $where_['total_time'] = array( 'between', array( $end_day, $yesterday ) );
         if($father_id){
             if($type == 1){
                 $where_['store_id'] = $father_id;
@@ -63,7 +62,6 @@ class PerformanceService
             }
         }
 
-        $where_                  = [];
         $where_['a.create_time'] = array( 'between', array( $end_day . " 00:00:00", $yesterday . " 23:59:59" ) );
 
         $field  = "b.id as agent_id,b.store_id,b.district_id,sum(a.scale_fee) as performance_total";

application/model/OBargainModel.php

@@ -1217,6 +1217,8 @@ class OBargainModel extends Model
                 break;
 
         }
+
+
         $result = $this->db_
             ->field($field)
             ->alias("a")
@@ -1225,7 +1227,7 @@ class OBargainModel extends Model
             ->group($group_)
             ->order($order)
             ->select();
-        // echo $this->db_->getLastSql();
+        //echo $this->db_->getLastSql();
         return $result;
 
     }