stanley-king před 8 roky
rodič
revize
09a504d2fe

+ 4 - 0
data/logic/queue.logic.php

@@ -649,4 +649,8 @@ class queueLogic
             return callback(false);
         }
     }
+    public function onUseBonus($param)
+    {
+
+    }
 }

+ 2 - 2
helper/account_helper.php

@@ -111,7 +111,7 @@ class account_helper
         {
             $to_minfo = new member_info($to_id);
             $thief = $to_minfo->nickname();
-            bonus_helper::withold_money($from_id,$bonus_rate['rate'],$amount);
+            bonus_helper::withold_money($from_id,$bonus_rate['rate'],$amount,bonus_helper::send_bonus_withold);
             $pred_from->handout_bonus($amount,$ret['type_sn'],$thief,"{$thief}摇走了您{$amount}元的红包.",\bonus\type::MakeShakeGainType);
             $bonusex = bonus_helper::send($ret['type_sn'],array($to_id));
             push_helper::stolen_bonus($minfo,$to_minfo,$amount);
@@ -138,7 +138,7 @@ class account_helper
         {
             $to_info = new member_info($to_id);
             $pred_from->handout_bonus($amount,$ret['type_sn'],$to_info->nickname(),"您摇丢了{$amount}的红包.",\bonus\type::MakeShakeLostType);
-            bonus_helper::withold_money($from_id,$rate,$amount);
+            bonus_helper::withold_money($from_id,$rate,$amount,bonus_helper::send_bonus_withold);
             $bonusex = bonus_helper::send($ret['type_sn'],array($to_id));
             push_helper::fly_bonus($minfo,$to_info,$amount);
             return $bonusex;

+ 2 - 2
helper/bonus/witholder.php

@@ -105,7 +105,7 @@ class witholder
                     $paied = $paied / 100;
                     $param['pay_amount'] = $paied;
                 }
-                QueueClient::push("OnUseBonus",['time' => time(),'use_type' => $this->mUsedType,'rate' => $rate,'amount' => $money / 100]);
+                QueueClient::push("onUseBonus",['time' => time(),'use_type' => $this->mUsedType,'rate' => $rate,'amount' => $money / 100]);
 
                 $this->mod_bonus->replace($param);
                 return true;
@@ -163,7 +163,7 @@ class witholder
                 $param['pay_amount'] = $paied;
             }
 
-            QueueClient::push("OnUseBonus",['time' => time(),'use_type' => $this->mUsedType,'rate' => $rate,'amount' => $used / 100]);
+            QueueClient::push("onUseBonus",['time' => time(),'use_type' => $this->mUsedType,'rate' => $rate,'amount' => $used / 100]);
             array_push($datas,$param);
         }
 

+ 4 - 4
helper/bonus_helper.php

@@ -262,18 +262,18 @@ class bonus_helper
         }
     }
 
-    static public function withold_money($member_id,$rate,$money)
+    static public function withold_money($member_id,$rate,$money,$used_type)
     {
-        $holder = new \bonus\witholder($member_id);
+        $holder = new \bonus\witholder($member_id,$used_type);
         if($holder->withold($rate,$money) == false) {
             Log::record("withold user member_id={$member_id} money={$money}.",Log::ERR);
         }
         return true;
     }
 
-    static public function withold_bonus($member_id,$bonus_sn,$rate,$money)
+    static public function withold_bonus($member_id,$bonus_sn,$rate,$money,$used_type)
     {
-        $holder = new \bonus\witholder($member_id);
+        $holder = new \bonus\witholder($member_id,$used_type);
         return $holder->withold_bonus($rate,$bonus_sn,$money);
     }
 

+ 4 - 2
helper/predeposit_helper.php

@@ -426,7 +426,7 @@ class predeposit_helper
         foreach ($rate_moneys as $item) {
             $rate = intval($item['rate']);
             $val = $item['hold_amount'];
-            bonus_helper::withold_bonus($this->member_id,$bonus_sn,$rate,$val);
+            bonus_helper::withold_bonus($this->member_id,$bonus_sn,$rate,$val,bonus_helper::send_bonus_withold);
         }
 
         $type_sn = $result['type_sn'];
@@ -508,7 +508,9 @@ class predeposit_helper
         }
         else
         {
-            if(bonus_helper::withold_bonus($this->member_id,$bonus->bonus_rate(),$bonus_sn,$type->getTotal_amount())) {
+            if(bonus_helper::withold_bonus($this->member_id,$bonus->bonus_rate(),
+                $bonus_sn,$type->getTotal_amount(),bonus_helper::send_bonus_withold))
+            {
                 $type_sn = $result['type_sn'];
                 $money = $result['money'];
                 $this->handout_bonus($money,$type_sn,session_helper::nickname(),"发送了{$money}元的红包.",\bonus\type::MakeSendType);