|
@@ -1920,10 +1920,11 @@ class Party extends Api
|
|
$guilderRate = $partyInfo->guilderRate; // 房主抽成百分比,包括公会房主,普通房房主
|
|
$guilderRate = $partyInfo->guilderRate; // 房主抽成百分比,包括公会房主,普通房房主
|
|
|
|
|
|
//爆币礼物单独比例
|
|
//爆币礼物单独比例
|
|
-
|
|
|
|
- if(isset($giftInfo['is_baobi']) && $giftInfo['is_baobi'] == 1){
|
|
|
|
- $platRate = config('site.baobi_gift_platrate');
|
|
|
|
- $guilderRate = config('site.baobi_gift_guilderrate');
|
|
|
|
|
|
+ if($is_back != 1){
|
|
|
|
+ if(isset($giftInfo['is_baobi']) && $giftInfo['is_baobi'] == 1){
|
|
|
|
+ $platRate = config('site.baobi_gift_platrate');
|
|
|
|
+ $guilderRate = config('site.baobi_gift_guilderrate');
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -2098,20 +2099,22 @@ class Party extends Api
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- //爆币
|
|
|
|
- if(isset($giftInfo['is_baobi']) && $giftInfo['is_baobi'] == 1){
|
|
|
|
|
|
+ //爆币,背包不爆币
|
|
|
|
+ if($is_back != 1){
|
|
|
|
+ if(isset($giftInfo['is_baobi']) && $giftInfo['is_baobi'] == 1){
|
|
|
|
|
|
- $res_baobi = $this->baobi($this->auth->id,$data["gift_id"],$giftCountValue,$giftInfo["value"]);
|
|
|
|
- if($res_baobi === false){
|
|
|
|
- Db::rollback();
|
|
|
|
- $this->error('爆币失败');
|
|
|
|
- }elseif($res_baobi === true){
|
|
|
|
- $returnData['baobi_total'] = 0;
|
|
|
|
- $returnData['baobi_beilv'] = 0;
|
|
|
|
- }else{
|
|
|
|
- //爆币了
|
|
|
|
- $returnData['baobi_total'] = $res_baobi['baobi_total'];
|
|
|
|
- $returnData['baobi_beilv'] = $res_baobi['baobi_beilv'];
|
|
|
|
|
|
+ $res_baobi = $this->baobi($this->auth->id,$data["gift_id"],$giftCountValue,$giftInfo["value"]);
|
|
|
|
+ if($res_baobi === false){
|
|
|
|
+ Db::rollback();
|
|
|
|
+ $this->error('爆币失败');
|
|
|
|
+ }elseif($res_baobi === true){
|
|
|
|
+ $returnData['baobi_total'] = 0;
|
|
|
|
+ $returnData['baobi_beilv'] = 0;
|
|
|
|
+ }else{
|
|
|
|
+ //爆币了
|
|
|
|
+ $returnData['baobi_total'] = $res_baobi['baobi_total'];
|
|
|
|
+ $returnData['baobi_beilv'] = $res_baobi['baobi_beilv'];
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|