dev

helper/refill/RefillBase.php

@@ -422,8 +422,6 @@ class RefillBase
                 $calc = new CalcMerchantPrice($mchid, $order->spec(), $order->card_type(), $order->cur_quality(), $this->mPolicy, $order->thrid_params());
             }
             $mch_price = $calc->calc_vgoods_price([]);
-            Log::record("onError RefillBase org_quality=$org_quality, mch_price=$mch_price", Log::DEBUG);
-
             $mch_amount = $mch_price * $order->quantity();
 
             return $mch_amount;

rdispatcher/proxy.php

@@ -46,12 +46,18 @@ class proxy
             Log::record("onError monitor_callback",Log::DEBUG);
             $mch_amount = refill\RefillFactory::instance()->mch_amount($order);
             Log::record("onError monitor_callback mchid=$mchid mch_amount=$mch_amount", Log::DEBUG);
-            if($mch_amount == false) {
-                refill\util::monitor_callback($mchid, $order->spec(), $order->card_type(), 0.0, 0, false, $order->order_time());
-            } else {
-                refill\util::monitor_callback($mchid, $order->spec(), $order->card_type(), $mch_amount, 0, false, $order->order_time());
+
+            if($mch_amount == false)
+            {
+                $refill_info = $mod_refill->getOrderInfo(['order_id' => $order_id]);
+                if(!empty($refill_info)) {
+                    $mch_amount = $refill_info['mch_amount'];
+                } else {
+                    $mch_amount = 0.0;
+                }
             }
 
+            refill\util::monitor_callback($mchid, $order->spec(), $order->card_type(), $mch_amount, 0, false, $order->order_time());
             $refill_info = Model('refill_order')->partition(util::part_refill($order_time))->getOrderInfo(['order_id' => $last_order_id]);
             $order_info = Model('refill_order')->partition(util::part_notify())->getOrderInfo(['order_id' => $last_order_id]);
             util::onEventComplete($refill_info, $order_info, false);