dev

helper/refill/RefillBase.php

@@ -158,11 +158,8 @@ class RefillBase
         }
 
         $mod_refill->edit($order_id, ['notify_time' => time(), 'is_retrying' => 0,'notify_state' => 1]);
-        Log::record("proc_notify pop_queue_order 1",Log::DEBUG);
         util::pop_queue_order($mchid,$mch_order);
-        Log::record("proc_notify pop_queue_order 2",Log::DEBUG);
         QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id,'manual' => false]);
-        Log::record("proc_notify pop_queue_order 3",Log::DEBUG);
 
         return true;
     }

rdispatcher/processor.php

@@ -39,25 +39,25 @@ class processor extends queue\ILooper
                         continue;
                     $this->mProxy->notify($channel, $input);
                 }
-//                elseif ($method == 'notify_mechant') {
-//                    $order_id = intval($params['order_id']);
-//                    $manual = $params['manual'] ?? false;
-//                    $this->mProxy->notify_merchant($order_id, $manual);
-//                } elseif ($method == 'query') {
-//                    $order_id = intval($params['order_id']);
-//                    $this->mProxy->query($order_id);
-//                } elseif ($method == 'query_net') {
-//                    $order_id = intval($params['order_id']);
-//                    $this->mProxy->query_net($order_id);
-//                } elseif ($method == 'manual_success') {
-//                    $order_id = intval($params['order_id']);
-//                    $this->mProxy->manual_success($order_id);
-//                } elseif ($method == 'manual_cancel') {
-//                    $order_id = intval($params['order_id']);
-//                    $this->mProxy->manual_cancel($order_id);
-//                } elseif ($method == 'addthird') {
-//                    $this->mProxy->addthird($params);
-//                }
+                elseif ($method == 'notify_mechant') {
+                    $order_id = intval($params['order_id']);
+                    $manual = $params['manual'] ?? false;
+                    $this->mProxy->notify_merchant($order_id, $manual);
+                } elseif ($method == 'query') {
+                    $order_id = intval($params['order_id']);
+                    $this->mProxy->query($order_id);
+                } elseif ($method == 'query_net') {
+                    $order_id = intval($params['order_id']);
+                    $this->mProxy->query_net($order_id);
+                } elseif ($method == 'manual_success') {
+                    $order_id = intval($params['order_id']);
+                    $this->mProxy->manual_success($order_id);
+                } elseif ($method == 'manual_cancel') {
+                    $order_id = intval($params['order_id']);
+                    $this->mProxy->manual_cancel($order_id);
+                } elseif ($method == 'addthird') {
+                    $this->mProxy->addthird($params);
+                }
                 else {
                     Log::record("Error Method={$method}", Log::DEBUG);
                 }