fix NotifyMerchantComplete

helper/refill/RefillBase.php

@@ -547,7 +547,7 @@ class RefillBase
         $refill_order = Model('refill_order');
 
         $order_info = $vr_order->getOrderInfo(['order_id' => $order_id]);
-        $refill_info = $refill_order->getOrderInfo(['order_id' => $order_id]);
+        $refill_info = $refill_order->getOrderInfo(['order_id' => $order_id,'inner_status' => 0,'is_retrying' => 0]);
 
         if (empty($order_info) || empty($refill_info)) {
             return [false, "无此订单"];
@@ -580,10 +580,10 @@ class RefillBase
             $refill_order->edit($order_id, ['mch_notify_times' => ['exp', 'mch_notify_times+1']]);
             $times = $refill_info['mch_notify_times'] + 1;
 
-            if ($times > 10) {
+            if ($times > 100) {
                 $refill_order->edit($order_id, ['mch_notify_state' => 2]);
             } else {
-                $period = intval(pow(2, $times));
+                $period = 5;
                 QueueClient::async_push("NotifyMerchantComplete", ['order_id' => $order_id,'manual' => false], $period);
             }