stanley-king 8 anni fa
parent
commit
af4d72c599
3 ha cambiato i file con 5 aggiunte e 38 eliminazioni
  1. 5 3
      helper/buy_first.php
  2. 0 23
      helper/predeposit_helper.php
  3. 0 12
      helper/refund_helper.php

+ 5 - 3
helper/buy_first.php

@@ -9,6 +9,7 @@
 require_once (BASE_ROOT_PATH . '/helper/activity_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/goods_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/pay_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/predeposit_helper.php');
 
 class buy_first
 {
@@ -56,7 +57,7 @@ class buy_first
 
         //红包信息
         $result['total_pred'] = doubleval($this->mLogicOut['available_predeposit']);
-        $result['available_pred']  = $this->available_pred($goods_amount);
+        $result['available_pred']  = $this->available_pred($goods_amount - $full_discount);
         $result['usable_pred'] = true;
 
         //是否可以开增值税发票
@@ -197,12 +198,13 @@ class buy_first
 
     private function invoice()
     {
-        //发票信息
         return $this->mLogicOut['inv_info'];
     }
+
     private function available_pred($goods_amount)
     {
-        return intval($goods_amount * 0.3 * 100 + 0.5) / 100;
+        $scale = predeposit_helper::scale();
+        return intval($goods_amount * $scale * 100 + 0.5) / 100;
     }
 
     public function format()

+ 0 - 23
helper/predeposit_helper.php

@@ -308,7 +308,6 @@ class predeposit_helper
         } else {
             $scale = 0.99;
         }
-
         return $scale;
     }
 
@@ -329,26 +328,4 @@ class predeposit_helper
 
         return ($cur_used - $pd_amount > 0 ? $cur_used - $pd_amount : 0);
     }
-
-//    public function calc_pred($pay_sn,&$avail_pred)
-//    {
-//        $logic_payment = Logic('payment');
-//        $result = $logic_payment->getRealOrderInfo($pay_sn, $_SESSION['member_id']);
-//
-//        if(empty($result)) {
-//            return false;
-//        }
-//        $data = $result['data'];
-//        $order_amount = $data['api_pay_amount'];
-//
-//        $member = Model('member');
-//        $relay_array = $member->getMemberPdInfo($_SESSION['member_id']);
-//        $avail_pred = floatval($relay_array['available_predeposit']);
-//        //$order_list = $data['order_list']; todo 需要更严格的扣费策略,从各个商品考虑
-//
-//        $use_pred = intval(($order_amount * 0.2) * 100);
-//        $use_pred = $use_pred > intval($avail_pred * 100) ? intval($avail_pred * 100) : $use_pred;
-//
-//        return $use_pred / 100;
-//    }
 }

+ 0 - 12
helper/refund_helper.php

@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 2016/10/11
- * Time: 下午3:55
- */
-class refund_helper
-{
-
-}