From 545ce257032237e8c77b5bb4b35baf8c704c7cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Wed, 24 Dec 2025 19:02:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E6=8D=A2=E9=BA=A6=20?=
 =?UTF-8?q?=E5=9C=A8=E7=A6=BB=E7=BA=BF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 16c302d5..3e0ea303 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -708,6 +708,7 @@ class Friend extends Model
                     $data_users[$key_data]['dress'] = model('Decorate')->user_decorate_detail($value_data['user_id'],1);
                     $data_users[$key_data]['charm'] = $charm??0;
                     $data_users[$key_data]['pit_number'] = $value_data['pit_number'];
+                    $data_users[$key_data]['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value_data['user_id'],'room_id' => $room_id])->value('is_online');
                 }
                 //推送给前端消息
                 $text['text'] = '房间换麦位';
@@ -765,6 +766,7 @@ class Friend extends Model
                 $data_users[$key_data]['dress'] = model('Decorate')->user_decorate_detail($value_data['user_id'],1);
                 $data_users[$key_data]['charm'] = $charm??0;
                 $data_users[$key_data]['pit_number'] = $value_data['pit_number'];
+                $data_users[$key_data]['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value_data['user_id'],'room_id' => $room_id])->value('is_online');
             }
             //推送给前端消息
             $text['text'] = '房间换麦位';

From 6488f65bd33cff5d5f9e3afa17802188a18c10a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Wed, 24 Dec 2025 19:41:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95=20=E5=92=8C=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Payment.php    | 6 +++++-
 application/api/controller/UserWallet.php | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Payment.php b/application/api/controller/Payment.php
index 278a55a0..abedc303 100644
--- a/application/api/controller/Payment.php
+++ b/application/api/controller/Payment.php
@@ -22,7 +22,7 @@ class Payment extends Controller
      * APP支付
      */
     public function app_pay() {
-        $type = input('type', 0); //1-微信 2-支付宝 4-通联支付宝 5-通联微信
+        $type = input('type', 0); //1-微信 2-支付宝 4-通联支付宝 5-通联微信 6-苹果支付
         $user_id = input('user_id', 0);
         $money = input('money', 0);
         $coin = input('coin', 0);
@@ -95,6 +95,10 @@ class Payment extends Controller
             Loader::import('TongLian.TongLian', EXTEND_PATH, '.php');
             $tonglian = new \TongLian();
             $result['tl'] = $tonglian->TongLianPay($data, $type);
+        }elseif($type == 6){
+            $result = null;
+        }else{
+            return V(0, '请选择正确的支付方式',  null);
         }
 
         return V(1, 'app支付', $result);
diff --git a/application/api/controller/UserWallet.php b/application/api/controller/UserWallet.php
index 9e7993eb..67ceda73 100644
--- a/application/api/controller/UserWallet.php
+++ b/application/api/controller/UserWallet.php
@@ -82,6 +82,8 @@ class UserWallet extends BaseCom
         foreach ($reslut as $k=>$v){
             $reslut_data[$k]['money'] = $v['money'];
             $reslut_data[$k]['coins'] = $v['coins'];
+            $reslut_data[$k]['ios_coins'] = $v['coins'] * 7 / 10;
+            $reslut_data[$k]['product_id'] = $v['product_id'];
         }
         return V(1, '获取成功', $reslut_data);
     }