dev

admin/control/provider_ctl.php

@@ -84,16 +84,19 @@ class provider_ctlControl extends SystemControl
                 ->limit(1000)
                 ->order('opened asc , sort desc')
                 ->select();
-            if (empty($providers)) {
-                showMessage('暂无相关通道', 'index.php?act=provider&op=index');
-            }
-            $formData = $this->formData($type, $form);
 
+//            if (empty($providers)) {
+//                showMessage('暂无相关通道', 'index.php?act=provider&op=index');
+//            }
+
+            $formData = $this->formData($type, $form);
             $amounts = $formData['amounts'];
             $cfgs = $formData['cfgs'];
             $types = $formData['types'];
-            if (!empty($speed_limit)) {
-                foreach ($speed_limit as $key => $speed) {
+            if (!empty($speed_limit))
+            {
+                foreach ($speed_limit as $key => $speed)
+                {
                     foreach ($speed as $value) {
                         $speed_limit[$key][$value['pid']] = $value;
                     }
@@ -105,7 +108,9 @@ class provider_ctlControl extends SystemControl
             $QPTA = $ProviderManager->getQPTA();
             $QPTA = $QPTA[$quality[$form]];
 
-            foreach ($providers as $key => $provider) {
+            $datas = [];
+            foreach ($providers as $key => $provider)
+            {
                 $result = [];
                 $pid = $provider['provider_id'];
                 $name = $provider['name'];
@@ -131,9 +136,11 @@ class provider_ctlControl extends SystemControl
                 }
                 $datas[$pid] = $result;
             }
-            if (empty($datas)) {
-                showMessage('暂无相关通道配置', 'index.php?act=provider&op=index');
-            }
+
+//            if (empty($datas)) {
+//                showMessage('暂无相关通道配置', 'index.php?act=provider&op=index');
+//            }
+
             Tpl::output('form', $formData);
             Tpl::output('datas', $datas);
             Tpl::output('providers', $providers);
@@ -186,6 +193,9 @@ class provider_ctlControl extends SystemControl
                 $amountData[] = $data;
             }
         }
+
+
+        $pcfgs = [];
         foreach ($cfgs as $cfg) {
             $pcfgs[$cfg['name']] = $cfg;
         }

helper/refill/util.php

@@ -431,8 +431,7 @@ class util
     {
         $card_type = $order->card_type();
         Log::record("onEvent before submit {$order->unique_id()} card_type=$card_type",Log::DEBUG);
-        return true;
-//        return EventManager::instance()->onBeforeSubmit($order);
+        return EventManager::instance()->onBeforeSubmit($order);
     }
 
     public static function onEventSubmit(order $order)

rdispatcher/proxy.php

@@ -180,10 +180,6 @@ class proxy
             return $this->onEerror($order, $need_callback,'运营商维护被全局拦截.');
         }
 
-        if(($order->commit_times() === 0) and (util::onEventBeforeSubmit($order) === false)) {
-            return true;
-        }
-
         if($order->first_commit())
         {
             if (!$order->match_card_type()) {
@@ -201,7 +197,12 @@ class proxy
             if($mch_amount === false) {
                 return $this->onEerror($order, $need_callback,'没有协商商品购买价格.');
             }
-            else {
+            else
+            {
+                if(util::onEventBeforeSubmit($order) === false) {
+                    return true;
+                }
+
                 refill\util::monitor_submit($order->mchid(), $order->spec(), $order->card_type(), $mch_amount,$order->order_time());
                 refill\util::onEventSubmit($order);
             }