stanley-king преди 1 месец
родител
ревизия
bf3a826fc2
променени са 1 файла, в които са добавени 16 реда и са изтрити 12 реда
  1. 16 12
      helper/refill/RefillBase.php

+ 16 - 12
helper/refill/RefillBase.php

@@ -360,18 +360,22 @@ class RefillBase
     public function zero_order(order $order,$errmsg='')
     {
         $buyer_id = $order->buyer_id();
-
-        try
-        {
-            $minfo = new member_info($order->buyer_id());
-            $calc = $this->getMerchantPriceCalc($order);
-            $mch_price = $calc->calc_vgoods_price([]);
-            $mch_amount = $mch_price * $order->quantity();
-        }
-        catch (Exception $ex) {
-            $mch_price = 0.00;
-            $mch_amount = 0.00;
-        }
+        $minfo = new member_info($order->buyer_id());
+
+
+//        try
+//        {
+//            $calc = $this->getMerchantPriceCalc($order);
+//            $mch_price = $calc->calc_vgoods_price([]);
+//            $mch_amount = $mch_price * $order->quantity();
+//        }
+//        catch (Exception $ex) {
+//            $mch_price = 0.00;
+//            $mch_amount = 0.00;
+//        }
+
+        $calc = new ZeroMerchantPrice($order->mchid(), $order->spec(), $order->card_type(),$order->cur_quality());
+        $mch_amount = $calc->calc_vgoods_price([]);
 
         $input['goods_id'] = ZERO_GOODS_ID;
         $input['quantity'] = 1; //数量