收藏客户bug

application/api_broker/controller/Broker.php

@@ -438,7 +438,8 @@ class Broker extends Basic
 
         /*修改记录部分 start*/
         $records              = new GOperatingRecords();
-        $param_['user_id'] = $user_id;
+        $param_['user_id']    = $user_id;
+        $param_['type']       = 4;
         $records_result       = $records->user_history($param_);
         $data['user_info']    = $user_res;
         $data['user_history'] = $records_result;

application/api_broker/controller/CollectUser.php

@@ -13,6 +13,7 @@ namespace app\api_broker\controller;
 use app\api_broker\extend\Basic;
 use app\api_broker\service\VipService;
 use app\model\ACollectUser;
+use app\model\Users;
 use think\Request;
 
 class CollectUser extends Basic
@@ -66,6 +67,10 @@ class CollectUser extends Basic
                 $res = true ;
             }
         }else{//不存在则新增数据
+            $is_outstrip_twenty_four_hours = $this->isNewUser($params['user_id']);
+            if($is_outstrip_twenty_four_hours == 0 ){
+                return $this->response("101", "客户在保护期内");
+            }
             $insert["agents_id"]    = $params['agents_id'];
             $insert["user_id"]      = $params['user_id'];
             $insert["status"]       = 1;
@@ -140,4 +145,29 @@ class CollectUser extends Basic
 
         return $this->response("200", "成功",$data);
     }
+
+    /**
+     * 判断客户是否在保护期内
+     * @param $user_id
+     * @return int
+     */
+    public function isNewUser($user_id)
+    {
+        $is_outstrip_twenty_four_hours = 1;
+        if(!$user_id){
+            return $is_outstrip_twenty_four_hours;
+        }
+        $Users = new Users();
+        $result = $Users->getUserCityInfo($user_id);
+        if($result){
+            if((time() - strtotime($result[0]['create_time'])) > (60*60*24)){
+                $is_outstrip_twenty_four_hours = 1;// 0：保护器内 1：超过保护期
+            }else{
+                $is_outstrip_twenty_four_hours = 0;// 0：保护器内 1：超过保护期
+            }
+        }
+        return $is_outstrip_twenty_four_hours;
+    }
+
+
 }
\ No newline at end of file

application/model/Users.php

@@ -841,7 +841,7 @@ class Users extends Model
 
     public function getUserCityInfo($id)
     {
-        $field='province,city,disc';
+        $field='province,city,disc,create_time';
         $params= [ 'id' => $id ];
         $result = Db::table($this->table)
             ->field($field)