admin update

admin/control/merchant.php

@@ -786,6 +786,10 @@ class merchantControl extends SystemControl
         $order_id = $_GET['order_id'];
         $mod_order = Model('vr_order');
         $order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
+        $refill_info = Model('refill_order')->getOrderInfo(['order_id' => $order_id,'inner_status' => 0,'is_retrying' => 0]);
+        if(empty($refill_info)) {
+            showMessage('订单不存在，或不符合条件', '');
+        }
         if ($order_info['order_state'] == ORDER_STATE_SEND) {
             QueueClient::push("QueryRefillState", ['order_id' => $order_id]);
         } else {
@@ -801,7 +805,10 @@ class merchantControl extends SystemControl
 
         $mod_order = Model('vr_order');
         $order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
-
+        $refill_info = Model('refill_order')->getOrderInfo(['order_id' => $order_id,'inner_status' => 0,'is_retrying' => 0]);
+        if(empty($refill_info)) {
+            showMessage('订单不存在，或不符合条件', '');
+        }
         $check_fetch_order = $this->check_fetch_order($order_info['order_sn']);
         if($check_fetch_order == false) {
             showMessage('此订单不可手动操作，请联系抢单人员操作！');

admin/control/refill_order_manual.php

@@ -52,8 +52,10 @@ class refill_order_manualControl extends SystemControl
 
         $mod_refill = Model('refill_order');
         $logic_vr_order = Logic("vr_order");
-        $refill_info = Model('refill_order')->getOrderInfo(['order_id' => $order_id]);
-
+        $refill_info = Model('refill_order')->getOrderInfo(['order_id' => $order_id,'inner_status' => 0,'is_retrying' => 0]);
+        if(empty($refill_info)) {
+            showMessage('订单不存在，或不符合条件', '');
+        }
         $check_fetch_order = $this->check_fetch_order($order_info['order_sn']);
         if($check_fetch_order == false) {
             showMessage('此订单不可手动操作，请联系抢单人员操作！');
@@ -84,6 +86,7 @@ class refill_order_manualControl extends SystemControl
             $order_sn = $_POST['order_sn'];
             $order_sn = str_replace(["\r\n", "\r", "\n"], ",", $order_sn);
             $condition['refill_order.order_sn'] = ['in', $order_sn];
+            $condition['refill_order.is_retrying'] = 0;
 
             if($type != 'notify') {
                 $condition['vr_order.order_state'] = ORDER_STATE_SEND;