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

This commit is contained in:
2025-11-18 11:58:39 +08:00

View File

@@ -858,6 +858,8 @@ class GiveGift extends Model
$ratio = $configs['room_cp_room_user_ratio']; $ratio = $configs['room_cp_room_user_ratio'];
}elseif ($from_type == 698){ }elseif ($from_type == 698){
$ratio = $configs['room_cp_guild_user_ratio']; $ratio = $configs['room_cp_guild_user_ratio'];
}else{
$ratio = 0;
} }
//计算收礼人收益 //计算收礼人收益
@@ -901,15 +903,15 @@ class GiveGift extends Model
if(in_array($change_type,$in_types)){ if(in_array($change_type,$in_types)){
//增加用户金币 //增加用户金币
$res1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->setInc('coin',$money); $res1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->setInc('coin',$money);
if(!$res1){ // if(!$res1){
return false; // return false;
} // }
}elseif(in_array($change_type,$out_types)){ }elseif(in_array($change_type,$out_types)){
//减少用户金币 //减少用户金币
$res1 = Db::name('user_wallet')->where(['user_id'=>$user_id,'coin'=>['>=',$money]])->setDec('coin',$money); $res1 = Db::name('user_wallet')->where(['user_id'=>$user_id,'coin'=>['>=',$money]])->setDec('coin',$money);
if(!$res1){ // if(!$res1){
return false; // return false;
} // }
} }
}elseif ($money_type == 2){//2钻石 }elseif ($money_type == 2){//2钻石
//增加用户钻石类型 //增加用户钻石类型
@@ -919,15 +921,15 @@ class GiveGift extends Model
if(in_array($change_type,$in_types)){ if(in_array($change_type,$in_types)){
//增加用户 //增加用户
$res1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->setInc('earnings',$money); $res1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->setInc('earnings',$money);
if(!$res1){ // if(!$res1){
return false; // return false;
} // }
}elseif(in_array($change_type,$out_types)){ }elseif(in_array($change_type,$out_types)){
//减少用户 //减少用户
$res1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->setDec('earnings',$money); $res1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->setDec('earnings',$money);
if(!$res1){ // if(!$res1){
return false; // return false;
} // }
} }
} }
return true; return true;