红包系统, 红包使用合法性判断条件添加

红包系统过滤冻结,使用红包列表

data/logic/payment.logic.php

@@ -36,7 +36,7 @@ class paymentLogic
         $obj_member = Model('member');
         $pd_amount = $obj_member->getPdAmount($member_info['member_id']);
         if (empty($order_list)) return -1;
-        if (floatval($pd_amount) <= 0) return -1;
+        if (floatval($pd_amount) <= 0.0) return -1;
 
         $model_order = Model('order');
         $model_pd = Model('predeposit');

data/model/member.model.php

@@ -770,7 +770,7 @@ class memberModel extends Model
         }
 
         // 预存款订单查询条件
-        $condition = 'lg_type in(\'order_pay\', \'order_freeze\', \'order_comb_pay\' ) and (lg_freeze_amount<>0.0 or lg_av_amount<0.0) and lg_member_id=\'' . $member_info['member_id'] . '\'';
+        $condition = 'lg_type in(\'order_pay\') and (lg_freeze_amount<>0.0 or lg_av_amount<0.0) and lg_member_id=\'' . $member_info['member_id'] . '\'';
         
         $model_pd = Model('predeposit');
         $tmp_log_list = array();