From 39d8853569af3e7dfbf4b3db833e704b7659fa64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 19 Sep 2025 16:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=89=88=E4=B9=8B=E5=90=8Ebug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/BlindBoxTurntable.php | 6 +++---
 application/api/model/BlindBoxTurntableGift.php  | 8 ++++----
 application/cron/controller/RoomPan.php          | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/api/controller/BlindBoxTurntable.php b/application/api/controller/BlindBoxTurntable.php
index e1d83b1..109eff0 100644
--- a/application/api/controller/BlindBoxTurntable.php
+++ b/application/api/controller/BlindBoxTurntable.php
@@ -46,11 +46,11 @@ class BlindBoxTurntable extends BaseCom
      * 礼物发放
      */
     public function gift_send(){
-        $key_name = "api:blind_box_turntable:gift_send:" . $this->uid;
-        redis_lock_exit($key_name);
+//        $key_name = "api:blind_box_turntable:gift_send:" . $this->uid;
+//        redis_lock_exit($key_name);
         $send_id = input('send_id',0);
         $reslut = model('BlindBoxTurntableGift')->gift_send($send_id);
-        redis_unlock($key_name);
+//        redis_unlock($key_name);
         return v($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index 06c2f3a..b7ce7d1 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -646,9 +646,6 @@ class BlindBoxTurntableGift extends Model
         $text_message = [];
         foreach ($blind_box_turntable_log as $key => $value) {
             $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
-            $ToUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value['gift_user_id']);//财富图标
-            $ToUserInfo['icon'][1] = model('UserData')->user_charm_icon($value['gift_user_id']);//魅力图标
-            $ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $value['gift_user_id'],'room_id' => $room_id])->value('charm');//魅力
             $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
             $textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
             $play_image[] = $draw_gift['play_image'];
@@ -670,7 +667,10 @@ class BlindBoxTurntableGift extends Model
             $ToUserInfosList[$value['gift_user_id']] = $ToUserInfo;
 
         }
-        foreach($ToUserInfosList as $userInfo) {
+        foreach($ToUserInfosList as &$userInfo) {
+            $userInfo['icon'][0] = model('UserData')->user_wealth_icon($userInfo['user_id']);//财富图标
+            $userInfo['icon'][1] = model('UserData')->user_charm_icon($userInfo['user_id']);//魅力图标
+            $userInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $userInfo['user_id'],'room_id' => $room_id])->value('charm');//魅力
             $ToUserInfos[] = $userInfo;
         }
         $text = [
diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php
index 48c30f4..9ca5dde 100644
--- a/application/cron/controller/RoomPan.php
+++ b/application/cron/controller/RoomPan.php
@@ -50,9 +50,6 @@ class RoomPan
             $text_message = $user_nickname;
             foreach ($blind_box_turntable_results_log as $key => $value) {
                 $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find();
-                $ToUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value['gift_user_id']);//财富图标
-                $ToUserInfo['icon'][1] = model('UserData')->user_charm_icon($value['gift_user_id']);//魅力图标
-                $ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $value['gift_user_id'],'room_id' => $room_id])->value('charm');//魅力
                 $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find();
                 $textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n";
                 $play_image[] = $draw_gift['play_image'];
@@ -73,7 +70,10 @@ class RoomPan
                 }
                 $ToUserInfosList[$value['gift_user_id']] = $ToUserInfo;
             }
-            foreach($ToUserInfosList as $userInfo) {
+            foreach($ToUserInfosList as &$userInfo) {
+                $userInfo['icon'][0] = model('UserData')->user_wealth_icon($userInfo['user_id']);//财富图标
+                $userInfo['icon'][1] = model('UserData')->user_charm_icon($userInfo['user_id']);//魅力图标
+                $userInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $userInfo['user_id'],'room_id' => $room_id])->value('charm');//魅力
                 $ToUserInfos[] = $userInfo;
             }
             $text = [