Merge remote-tracking branch 'origin/develop' into develop

application/api/model/UserCp.php

@@ -33,8 +33,11 @@ class UserCp extends Model
             return 0;
         }
         //查询收礼人有没有给送礼人送过cp礼物 status：0-待回应，1-建交成功，2-已取消
-        $res = Db::name('user_cp_find')->where(['from_user_id' => $to_user_id, 'to_user_id' => $from_user_id,'status' => 0])->find();
-        if($res){
+        $res = Db::name('user_cp_find')
+            ->where(['from_user_id' => $to_user_id, 'to_user_id' => $from_user_id,'status' => 0])
+            ->find();
+
+        if($res && $res['createtime'] + 86400 < time()){//24小时内
             //创建推送信息1：回应送礼 并创建Cp空间，
             $data = [
                 'from_user_id' => $from_user_id,