dev

rdispatcher/proxy.php

@@ -145,8 +145,11 @@ class proxy
 
         $order->finish();
         refill\util::pop_queue_order($mchid, $mch_order, $order->order_time());
-        QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id, 'manual' => false]);
 
+        if(!$time_out) {
+            QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id, 'manual' => false]);
+        }
+        
         return true;
     }