MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-09-05 16:39:02 +08:00
parent 73ab0691b4 580281d6b9
commit b0ae83dd8f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/api/model/Topic.php
View File

@@ -44,7 +44,7 @@ class Topic extends Model
if($list){
foreach ($list as &$item){
$item['content'] = $this->where(['id'=>$item['topic_id']])->value('content');
$item['pic'] = $this->where(['id'=>$item['topic_id']])->value('pic');
$item['pic'] = $this->where(['id'=>$item['topic_id']])->value('pic') ?? get_system_config_value('web_site').'/data/avatar/head_pic.png';;
$item['title'] = $this->where(['id'=>$item['topic_id']])->value('title');
}
}

7
application/api/model/UserWallet.php
View File

@@ -106,10 +106,11 @@ class UserWallet extends Model
return ['code' => 0, 'msg' => '钻石数量不足', 'data' => null];
}
$ear_exchange_coin = get_system_config_value('coin_exchange_rate');
$data = [
'user_id' => $uid,
'earnings_num' => $earnings_num,
'coin_num' => $earnings_num * 10,
'coin_num' => $earnings_num * $ear_exchange_coin,
'createtime' => time(),
];
//开启事务
@@ -130,7 +131,7 @@ class UserWallet extends Model
$account_log[] = [
'user_id' => $uid,
'money_type' => 1,
'change_value' => $earnings_num * 10,
'change_value' => $earnings_num * $ear_exchange_coin,
'remarks' => '收益兑换',
'change_type' => 14,
'createtime' => time(),
@@ -138,7 +139,7 @@ class UserWallet extends Model
];
$re = db::name('vs_user_money_log')->insertAll($account_log);
$re1 = db::name('user_wallet')->where('user_id',$uid)->setDec('earnings',$earnings_num);
$re2 = db::name('user_wallet')->where('user_id',$uid)->setInc('coin',$earnings_num * 10);
$re2 = db::name('user_wallet')->where('user_id',$uid)->setInc('coin',$earnings_num * $ear_exchange_coin);
if($re && $re1 && $re2){
db::commit();
return ['code' => 1, 'msg' => '兑换成功', 'data' => null];