bug

application/api_broker/controller/CollectHouse.php

@@ -119,8 +119,8 @@ class CollectHouse extends Basic
         $res        = $this->aCollectHouse->getCollectList($pageNo,$pageSize,$field,$get_params);
         $res_total  = $this->aCollectHouse->getCollectListTotal($field,$get_params);
         $look_shop_service = new LookShopService();
-        foreach ($res as $key => $val) {
 
+        foreach ($res as $key => $val) {
             $isLook                     = $look_shop_service->isLooked($params["agents_id"], $val["id"]);
             $res[$key]["is_look"]       = $isLook;
             $res[$key]["rent_price"]    = $val["rent_price"] * 0.01;

application/api_broker/controller/User.php

@@ -204,7 +204,7 @@ class User extends Basic
             $where['id'] = [ 'lt', $params['user_id'] ];
             $order       = 'id desc';
         }
-        $field    = 'id,user_nick,agent_id,vip';
+        $field    = 'id,user_nick,agent_id,vip,create_time';
         $user     = new Users();
         $user_res = $user->getLastOrNextUserID($where, $field, $limit = 1, $order);
         if (!$user_res) {
@@ -224,6 +224,11 @@ class User extends Basic
             return $this->response("201", "当天被拨打超过5次", ['user_id'=>$user_res[0]['id']]);
         }
 
+        // 判断是否24小时保护期内
+        if((time() - strtotime($user_res[0]['create_time'])) < (60*60*24)){
+            return $this->response("201", "24小时保护期内", ['user_id'=>$user_res[0]['id']]);
+        }
+
         $where         = [];
         $where['city'] = trim($this->city);
         $field         = 'max(id) as max_id';

application/model/ACollectHouse.php

@@ -57,7 +57,7 @@ class ACollectHouse extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('CollectUser')
-            ->join('g_houses Houses', 'CollectUser.house_id = Houses.id', 'left')
+            ->join('g_houses Houses', 'CollectUser.house_id = Houses.id', 'right')
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)