|
@@ -31,7 +31,7 @@ interface IPriceCalculate
|
|
|
public function bonus_amount($goods_amount,$goods_lowest_amount);
|
|
|
public function bonus_way($bonus_amount);
|
|
|
public function bonus_detail($bonus_amount,$room_id);
|
|
|
- public function hold_bonus($user_bonus,$room_id,$room_bonus);
|
|
|
+ public function hold_bonus($user_bonus);
|
|
|
}
|
|
|
|
|
|
class normal_calc implements IPriceCalculate
|
|
@@ -58,7 +58,7 @@ class normal_calc implements IPriceCalculate
|
|
|
{
|
|
|
return 0.00;
|
|
|
}
|
|
|
- public function hold_bonus($user_bonus,$room_id,$room_bonus) {
|
|
|
+ public function hold_bonus($user_bonus) {
|
|
|
|
|
|
}
|
|
|
public function bonus_way($bonus_amount) {
|
|
@@ -663,7 +663,8 @@ class account implements IPriceCalculate
|
|
|
|
|
|
return ['user_bonus' => $ways['available_bonus'],'room_bonus' => $room_val,'room_id' => $roomid];
|
|
|
}
|
|
|
- public function hold_bonus($user_bonus,$room_id,$room_bonus)
|
|
|
+
|
|
|
+ public function hold_bonus($user_bonus)
|
|
|
{
|
|
|
if(intval($user_bonus * 100 + 0.5) > 0)
|
|
|
{
|
|
@@ -671,10 +672,6 @@ class account implements IPriceCalculate
|
|
|
$this->mPayRates->with_hold(30, $user_bonus);
|
|
|
$this->mDirty = true;
|
|
|
}
|
|
|
-
|
|
|
- if($room_id > 0 && intval($room_bonus * 100 + 0.5) > 0) {
|
|
|
- //todo需要扣除共享基金
|
|
|
- }
|
|
|
}
|
|
|
static private function create_moneycalc($rate_moneys)
|
|
|
{
|