From b22c9af6a6a8ce7c78b76cd3ca4f938cf5023492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Mon, 12 Jan 2026 14:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E8=A1=A8=E6=9B=B4=E6=8D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/User.php | 23 ++++++++++++++----- application/api/controller/Decorate.php | 2 +- application/api/model/Sign.php | 2 +- application/api/model/SingerSong.php | 2 +- application/api/model/UserWithdrawal.php | 2 +- .../cron/controller/AppTodayStatistical.php | 5 ++-- .../cron/controller/PerformPerSecond.php | 12 +++++----- 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/application/adminapi/controller/User.php b/application/adminapi/controller/User.php index dac9fad3..b9ddd1ce 100644 --- a/application/adminapi/controller/User.php +++ b/application/adminapi/controller/User.php @@ -595,7 +595,7 @@ class User extends adminApi a.user_code, a.login_device, c.coin, - c.earnings, + d.earnings, b.is_real, a.init_code, a.status, @@ -603,12 +603,14 @@ class User extends adminApi '; $count = db::name('user')->alias('a') ->join('fa_user_auth b', 'a.mobile = b.mobile','LEFT') - ->join('user_wallet c', 'a.id = c.user_id','LEFT') + ->join('user_wallet_coin c', 'a.id = c.user_id','LEFT') + ->join('user_wallet_earnings d', 'a.id = d.user_id','LEFT') ->where($where) ->count(); $user_data = db::name('user')->alias('a') ->join('fa_user_auth b', 'a.mobile = b.mobile','LEFT') - ->join('user_wallet c', 'a.id = c.user_id','LEFT') + ->join('user_wallet_coin c', 'a.id = c.user_id','LEFT') + ->join('user_wallet_earnings d', 'a.id = d.user_id','LEFT') ->where($where) ->field($field) ->order('a.id desc'); @@ -905,14 +907,23 @@ class User extends adminApi ]); } //查他的钱包 - $wallet = db::name('user_wallet')->where(['user_id'=>$user_id])->find(); - if($wallet){ - db::name('user_wallet')->where(['id'=>$wallet['id']])->update([ + //清空金币表 + $wallet_coin = db::name('user_wallet_coin')->where(['user_id'=>$user_id])->find(); + if($wallet_coin){ + db::name('user_wallet_coin')->where(['id'=>$wallet_coin['id']])->update([ 'coin' => 0, + 'updatetime' => time(), + ]); + } + //清空钻石表 + $wallet_earnings = db::name('user_wallet_earnings')->where(['user_id'=>$user_id])->find(); + if($wallet_earnings){ + db::name('user_wallet_earnings')->where(['id'=>$wallet_earnings['id']])->update([ 'earnings' => 0, 'updatetime' => time(), ]); } + //他的装扮 $dress = db::name('vs_user_decorate')->where(['user_id'=>$user_id])->select(); if($dress){ diff --git a/application/api/controller/Decorate.php b/application/api/controller/Decorate.php index 1e5f7c4e..393588ee 100644 --- a/application/api/controller/Decorate.php +++ b/application/api/controller/Decorate.php @@ -43,7 +43,7 @@ class Decorate extends BaseCom $data = []; $reslut = model('Decorate')->get_decorate_detail($did); //当前用户金币 - $user_coin = db::name('user_wallet')->where(['user_id' => $this->uid])->value('coin'); + $user_coin = db::name('user_wallet_coin')->where(['user_id' => $this->uid])->value('coin'); $data['user_info']['user_id'] = $this->uid; $data['user_info']['user_coin'] = intval($user_coin); $data['decorate'] = $reslut['data']; diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php index 2301311d..b0e8e3f2 100644 --- a/application/api/model/Sign.php +++ b/application/api/model/Sign.php @@ -83,7 +83,7 @@ class Sign extends Model */ public function sign_coin($user_id,$room_id,$sign_user_id,$sign_value,$sign_time){ //查询用户金币 - $user_coin = db::name('user_wallet')->where('user_id',$user_id)->value('coin'); + $user_coin = db::name('user_wallet_coin')->where('user_id',$user_id)->value('coin'); if($user_coin < $sign_value){ return ['code' => 0, 'msg' => '金币不足','data' => null]; } diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php index 5990de19..67c83701 100644 --- a/application/api/model/SingerSong.php +++ b/application/api/model/SingerSong.php @@ -157,7 +157,7 @@ class SingerSong extends Model return ['code' => 0, 'msg' => '不能点自己歌曲', 'data' => null]; } //查询用户余额 - $user_money = db::name('user_wallet')->where(['user_id' => $user_id])->value('coin'); + $user_money = db::name('user_wallet_coin')->where(['user_id' => $user_id])->value('coin'); $gift_price = db::name('vs_gift')->where(['gid' => $song['gift_id']])->value('gift_price'); if ($user_money < $gift_price * $song['gift_num']) { return ['code' => 0, 'msg' => '余额不足', 'data' => null]; diff --git a/application/api/model/UserWithdrawal.php b/application/api/model/UserWithdrawal.php index 02b91693..45923844 100644 --- a/application/api/model/UserWithdrawal.php +++ b/application/api/model/UserWithdrawal.php @@ -149,7 +149,7 @@ class UserWithdrawal extends Model return ['code' => 0, 'msg' => "请重试2", 'data' => null]; } //修改提现余额 - $surplus_earnings = Db::name('user_wallet')->where('user_id', $user_id)->value('earnings'); + $surplus_earnings = Db::name('user_wallet_earnings')->where('user_id', $user_id)->value('earnings'); if ($surplus_earnings > 0) { $surplus_earnings = $surplus_earnings / $diamond_to_rmb_ratio; //剩余金额(人民币) } diff --git a/application/cron/controller/AppTodayStatistical.php b/application/cron/controller/AppTodayStatistical.php index 3d63a269..393fed1b 100644 --- a/application/cron/controller/AppTodayStatistical.php +++ b/application/cron/controller/AppTodayStatistical.php @@ -32,7 +32,8 @@ class AppTodayStatistical $time = strtotime(date('Y-m-d')); $stime = strtotime(date('Y-m-d')); $etime = strtotime(date('Y-m-d 23:59:59')); - $user_list = Db::name('user_wallet')->select(); +// $user_list = Db::name('user_wallet')->select(); + $user_list = db::name('user_wallet_coin')->select(); foreach ($user_list as $k=>$v){ $gift_pack = Db::name('vs_user_gift_pack')->field('gid,num')->where(['user_id'=>$v['user_id'],'is_tester'=>1])->select(); $gift_pack_price = 0; @@ -71,7 +72,7 @@ class AppTodayStatistical $data = [ 'user_id'=>$v['user_id']??0, 'coin'=>$v['coin']??0, - 'earnings'=>$v['earnings']??0, + 'earnings'=> db::name('user_wallet_earnings')->where('user_id', $v['user_id'])->value('earnings')??0, 'gift_pack_price'=>$gift_pack_price??0, 'room_flow_price'=>$transaction??0, 'guild_flow_price'=>$guild_flow_price??0, diff --git a/application/cron/controller/PerformPerSecond.php b/application/cron/controller/PerformPerSecond.php index 5b8869fe..3dd1fdca 100644 --- a/application/cron/controller/PerformPerSecond.php +++ b/application/cron/controller/PerformPerSecond.php @@ -181,12 +181,12 @@ class PerformPerSecond // 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, 'received_tax_amount' => $result['data']['received_tax_amount'] ?? 0, ]); - if($up_result){ - //扣除冻结金额 - $diamond_to_rmb_ratio = get_system_config_value('diamond_to_rmb_ratio'); - $money = $value['money'] * $diamond_to_rmb_ratio; //提现金额转换 人民币转为钻石 - $result = db::name('user_wallet')->where('user_id', $value['user_id'])->setDec('frozen_earnings', $money); - } +// if($up_result){ +// //扣除冻结金额 +// $diamond_to_rmb_ratio = get_system_config_value('diamond_to_rmb_ratio'); +// $money = $value['money'] * $diamond_to_rmb_ratio; //提现金额转换 人民币转为钻石 +// $result = db::name('user_wallet')->where('user_id', $value['user_id'])->setDec('frozen_earnings', $money); +// } }else{ db::name('vs_user_withdrawal')->where('order_sn',$value['order_sn'])->update([ 'status' => 5,