交友房开始推送消息

application/api/model/Friend.php

@@ -27,6 +27,7 @@ class Friend extends Model
         if($pit_user >= 2) {
             $data['room_id'] = $room_id;
             $data['end_time'] = time() + get_system_config_value('friend_time') * 60;
+            $data['create_time'] = time();
             $data['status'] = 1;
 
             $id = db::name('vs_user_friending')->insertGetId($data);
@@ -58,9 +59,12 @@ class Friend extends Model
             return ['code' => 0, 'msg' => '没有权限操作', 'data' => null];
         }
 
-        if (!$id || !$room_id || $delay_times <= 0) {
+        if (!$id || !$room_id) {
             return ['code' => 0, 'msg' => '参数有误！', 'data' => null];
         }
+        if($delay_times <= 0){
+            $delay_times = get_system_config_value('friend_delay_times');
+        }
         //修改结束 时间
         $res = db::name('vs_user_friending')->where('id', $id)->update(['end_time' => ['exp', 'end_time+' . $delay_times * 60]]);
         if(!$res){
@@ -238,7 +242,7 @@ class Friend extends Model
         }
         //送礼成功后续操作
         //查看当前时间是否在交友表的创建时间和结束时间段内 用来区分是否要拉取心动值高的用户上麦
-        $friend = db::name('vs_user_friending')->where(['room_id' => $room_id])->find();
+        $friend = db::name('vs_user_friending')->where(['room_id' => $room_id,'status' => 1])->order('id desc')->find();
         if(time() >= $friend['create_time'] && time() <= $friend['end_time']){
             $heart_exp = get_system_config_value('coin_charm_exp');//金币与魅力值转换比
             $sumPrice = $res['data']['gift_total'] * $heart_exp;