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); } 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'] = '房间换麦位';