Merge branch 'test'

application/index/controller/OperationData.php

@@ -423,7 +423,7 @@ class OperationData extends Basic
                 } else {
                     $conditions['site_id'] = $v['site_id'];
                 }
-                $conditions['create_time'] = array( 'between', array( $p_start . " 00:00:00", $p_end . " 23:59:59" ) );
+                $conditions['total_time'] = array( 'between', array( $p_start . " 00:00:00", $p_end . " 23:59:59" ) );
                 $performanceSum = $m_total->performanceStatistics($conditions, 1);
                 $value_['performance'] = isset($performanceSum[0]["performance_total"]) ? $performanceSum[0]["performance_total"] : 0;
 
@@ -435,7 +435,8 @@ class OperationData extends Basic
                 } else {
                     $conditions['site_id'] = $v['site_id'];
                 }
-                $conditions['create_time'] = array( 'between', array( $r_p_start . " 00:00:00", $r_p__end . " 23:59:59" ) );
+
+                $conditions['total_time'] = array( 'between', array( $r_p_start . " 00:00:00", $r_p__end . " 23:59:59" ) );
                 $real_performanceSum = $m_total->performanceStatistics($conditions, 2);
                 $value_['real_performance'] = isset($real_performanceSum[0]["official_receipts_total"]) ? $real_performanceSum[0]["official_receipts_total"] : 0;
 

application/model/TAgentTotalModel.php

@@ -364,8 +364,8 @@ class TAgentTotalModel extends Model
             $field  = "sum(a.official_receipts) as official_receipts_total";
         }
 
-        if (isset($params["create_time"])) {
-            $where_["a.create_time"] = $params["create_time"];
+        if (isset($params["total_time"])) {
+            $where_["a.total_time"] = $params["total_time"];
         }
 
         if (isset($params["site_id"])) {
@@ -378,7 +378,7 @@ class TAgentTotalModel extends Model
             ->join("a_agents b", "a.agent_id = b.id", "left")
             ->where($where_)
             ->select();
-        // dump($this->getLastSql());
+        // big_log($this->getLastSql());
         return $return;
     }
 }
\ No newline at end of file

application/model/TLookShopModel.php

@@ -44,7 +44,7 @@ class TLookShopModel extends Model
             ->where($condition)
             ->page($pageNo)
             ->limit($pageSize)
-            //->order("id desc")
+            ->order("id desc")
             ->select();
     }
     public function getListCount($condition, $field)