Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -60,7 +60,6 @@ class Shop extends Basic
         header('Access-Control-Allow-Origin:*');
 
         $params = $this->params;
-        big_log(json_encode($params));
         /*  $params = array(
               "site_area"           => 4, //来源 1c首页  2c搜索 3b首页 4b搜索 5b报备
              // "title"               => "vv", //1，2 external_title  ,3,4internal_title

application/api_broker/controller/User.php

@@ -514,7 +514,7 @@ class User extends Basic
 
         $field    = 'id,user_nick,agent_id,vip,create_time';
         $user     = new Users();
-        $user_res = $user->getLastOrNextUserID($where, $field, $limit = 1, $order, $type);
+        $user_res = $user->getLastOrNextUserID($where, $field, $order, $type, 0,1);
         if (!$user_res) {
             return $this->response("201", "查无数据", [ 'user_id' => $params['user_id'] ]);
         }
@@ -553,9 +553,9 @@ class User extends Basic
         $where['city'] = trim($this->city);
         $field         = 'max(id) as max_id';
         $order         = 'id asc';
-        $max_id        = $user->getLastOrNextUserID($where, $field, $limit = '', $order, $type);
+        $max_id        = $user->getLastOrNextUserID($where, $field, $order, $type, 0,1);
         $field         = 'MIN(id) as min_id';
-        $min_id        = $user->getLastOrNextUserID($where, $field, $limit = '', $order, $type);
+        $min_id        = $user->getLastOrNextUserID($where, $field,  $order, $type,0,1);
         return $this->response("200", "success！", [
                 'user_id'     => $user_res[0]['id'],
                 'max_user_id' => $max_id[0]['max_id'],

application/model/SubletModel.php

@@ -54,7 +54,7 @@ class SubletModel extends BaseModel
             ->limit($pageSize)
             ->page($pageNo)
             ->select();
-        big_log($this->getLastSql());
+        // big_log($this->getLastSql());
         return $result;
     }
 

application/model/Users.php

@@ -875,7 +875,7 @@ class Users extends Model
     }
 
 
-    public function getLastOrNextUserID($where, $field, $limit, $order, $type)
+    public function getLastOrNextUserID($where, $field, $order, $type,$page, $limit)
     {
 
         if ($type == 1) {
@@ -884,6 +884,7 @@ class Users extends Model
                 ->where($where)
                 ->order($order)
                 ->limit($limit)
+                ->page($page)
                 ->select();
         } elseif ($type == 2) {
             $result = $this->field($field)
@@ -892,6 +893,7 @@ class Users extends Model
                 ->where($where)
                 ->order($order)
                 ->limit($limit)
+                ->page($page)
                 ->select();
         } elseif ($type == 3) {
             $result = $this->field($field)
@@ -900,6 +902,7 @@ class Users extends Model
                 ->where($where)
                 ->order($order)
                 ->limit($limit)
+                ->page($page)
                 ->select();
         } elseif ($type == 4) {
             $result = $this->field($field)
@@ -909,17 +912,16 @@ class Users extends Model
                 ->where('a.referrer_source', 20)
                 ->order($order)
                 ->limit($limit)
+                ->page($page)
                 ->select();
         } else {
             $result = $this->field($field)->alias('a')
                 ->where($where)
                 ->order($order)
+                ->limit($limit)
+                ->page($page)
                 ->select();
         }
-
-        //echo $this->getLastSql();
-        //dump($this->getLastSql());exit;
-
         return $result;
     }
 

application/task/controller/KillOutTimeSql.php

@@ -18,11 +18,9 @@ class KillOutTimeSql{
         $result = $model->query($sql);
         if($result){
             foreach ($result as $item){
-                $kill_sql = $item["kill_sql"];
                 $log = "out_time_sql :" .$item["info"];
                 big_log($log);
-                $model->query($kill_sql);
-                $kill_sql = "";
+                $model->query($item["kill_sql"]);
             }
 
         }