fix bonus bug

data/logic/buy.logic.php

@@ -227,10 +227,12 @@ class buyLogic
         $result['inv_info'] = $inv_info;
 
         $buyer_info	= Model('member')->getMemberInfoByID($member_id);
+        $pred_helper = new predeposit_helper($member_id);
+        $result['available_predeposit'] = $pred_helper->total_bonus();
 
-        if (floatval($buyer_info['available_predeposit']) > 0) {
-            $result['available_predeposit'] = $buyer_info['available_predeposit'];
-        }
+//        if (floatval($buyer_info['available_predeposit']) > 0) {
+//            $result['available_predeposit'] = $buyer_info['available_predeposit'];
+//        }
 
         if (floatval($buyer_info['available_rc_balance']) > 0) {
             $result['available_rc_balance'] = $buyer_info['available_rc_balance'];

data/model/user_bonus.model.php

@@ -46,7 +46,7 @@ class user_bonusModel extends Model
 
     public function getUsableSum($member_id)
     {
-        $cond = array('user_id' => $member_id,'bonus_status' => 3,'usable_time' => array('gt',time()));
+        $cond = array('user_id' => $member_id,'bonus_status' => 3,'usable_time' => array('gt',time()),'expired' => 0);
         return $this->table('user_bonus')->where($cond)->sum('remain_amount');
     }