admin refill_order notify add sending exec

admin/control/merchant.php

@@ -750,7 +750,13 @@ class merchantControl extends SystemControl
     public function notify_merchantOp()
     {
         $order_id = $_GET['order_id'];
-        QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id,'manual' => true]);
+        $mod_order = Model('vr_order');
+        $order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
+        if($order_info['order_state'] == ORDER_STATE_SEND) {
+            QueueClient::push("QueryRefillState",['order_id' => $order_id]);
+        }else{
+            QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id,'manual' => true]);
+        }
         showMessage('操作成功', 'index.php?act=merchant&op=refill_order');
     }