From 4a67312897d6ea51b6213f37a186cb234a68bb64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 20 Nov 2025 10:37:08 +0800
Subject: [PATCH] =?UTF-8?q?cp=20=E7=9B=B8=E4=BA=92=E9=80=81=E7=A4=BC=20?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/GiveGift.php |  2 +-
 application/api/model/UserCp.php   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/api/model/GiveGift.php b/application/api/model/GiveGift.php
index c075f3d..8337a28 100644
--- a/application/api/model/GiveGift.php
+++ b/application/api/model/GiveGift.php
@@ -522,7 +522,7 @@ class GiveGift extends Model
                 model('DailyTasks')->tasks_complete($uid,3);
             }
             //cp检测且处理升级事宜
-            $cp_type = model('api/UserCp')->checkGift($uid, $gid, $to_id, $from_id);//0-不处理，1-表明心意，2-组成Cp
+            $cp_type = model('api/UserCp')->checkGift($uid, $gid, $to_id, $from_id, $num);//0-不处理，1-表明心意，2-组成Cp
             if($cp_type == 1){
                 $textt1 = "亲爱的用户，您好！\n".$FromUserInfo['nickname'] . ' 的 【' .$gift_info['gift_name'].' 】 已送达，这是他的心动信号。回赠一个，即可锁定这份缘分！';
                 $textt = '';
diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php
index f813871..d537c42 100644
--- a/application/api/model/UserCp.php
+++ b/application/api/model/UserCp.php
@@ -16,7 +16,7 @@ class UserCp extends Model
      * @param $room_id 房间ID
      * @return int 0-无，1-等待回应，2-已建立Cp空间
      */
-    public function checkGift($from_user_id, $gift_id, $to_user_id, $room_id)
+    public function checkGift($from_user_id, $gift_id, $to_user_id, $room_id, $num)
     {
         //查询是否已经存在Cp空间
         $rees = Db::name('user_cp_zone')->where(['user_id1' => $from_user_id,'user_id2' => $to_user_id,'status' => 1])->find();
@@ -24,7 +24,7 @@ class UserCp extends Model
             $rees = Db::name('user_cp_zone')->where(['user_id1' => $to_user_id,'user_id2' => $from_user_id,'status' => 1])->find();
         }
         if($rees){
-            $this->addCpLevel($from_user_id, $to_user_id, $room_id, $gift_id, $rees['id']);
+            $this->addCpLevel($from_user_id, $to_user_id, $room_id, $gift_id, $rees['id'], $num);
             return 0;
         }
 
@@ -105,12 +105,12 @@ class UserCp extends Model
      * @param $room_id 房间ID
      * @param $cp_zone_id Cp空间ID
      */
-    public function addCpLevel($from_user_id, $to_user_id, $room_id, $gift_id, $cp_zone_id)
+    public function addCpLevel($from_user_id, $to_user_id, $room_id, $gift_id, $cp_zone_id, $num)
     {
         $jinbi_arr = explode(',', get_system_config_value('cp_exp_rate'));
         $jinbi = $jinbi_arr[0];
         $jinyan = $jinbi_arr[1];
-        $exp = round(db::name('vs_gift')->where(['gid' => $gift_id])->value('gift_price') / $jinbi * $jinyan, 2);
+        $exp = round(db::name('vs_gift')->where(['gid' => $gift_id])->value('gift_price') * $num / $jinbi * $jinyan, 2);
         $yuan_exp = Db::name('user_cp_zone')->where(['id' => $cp_zone_id])->value('exp');
 
         //添加一个记录
@@ -126,7 +126,7 @@ class UserCp extends Model
         ];
         Db::name('user_cp_gift_log')->insert($datas);
         //判断是否升级
-        $level = Db::name('user_cp_level')->where(['change_value' => ['<=', $yuan_exp + $exp]])->order('change_value desc')->value('level');
+        $level = Db::name('user_cp_level')->where(['change_value' => ['<=', $yuan_exp + $exp],'deletetime' => 0])->order('change_value desc')->value('level');
         if($level){
             //修改Cp空间等级
             $data['level'] = $level;