Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -731,15 +731,15 @@ class GiveGift extends Model
|
|||||||
return ['code' => 0, 'msg' => '房主收益失败', 'data' => null];
|
return ['code' => 0, 'msg' => '房主收益失败', 'data' => null];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
//增加房主收益并记录日志
|
//增加房主收益并记录日志
|
||||||
$room_owner_earning = $this -> change_user_cion_or_earnings_log($room_owner,$room_owner_earnings,$from_id,2,18,'房主收益');
|
$room_owner_earning = $this -> change_user_cion_or_earnings_log($room_owner,$room_owner_earnings,$from_id,2,18,'房主收益');
|
||||||
if(!$room_owner_earning){
|
if(!$room_owner_earning){
|
||||||
return ['code' => 0, 'msg' => '房主收益失败', 'data' => null];
|
return ['code' => 0, 'msg' => '房主收益失败', 'data' => null];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if($gift_info['label'] == 2){
|
if($gift_info['label'] == 2){
|
||||||
foreach ($gift_box as $gv) {
|
foreach ($gift_box as $gv) {
|
||||||
//记录送礼利率和各方收益
|
//记录送礼利率和各方收益
|
||||||
|
|||||||
Reference in New Issue
Block a user