增加预回调通道直接补快充

admin/control/refill_order_manual.php

@@ -511,10 +511,11 @@ class refill_order_manualControl extends SystemControl
                 $this->log("预回调订单转快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
             }
             elseif ($type === 'canceled_order_retry') {
-                [$succ,$err] = refill\util::retry_canceled_order($order_id);
+                [$succ,$err] = refill\util::retry_canceled_order($order_id,false);
                 $this->log("预回调订单失败补充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid} err:{$err}");
             }
             elseif ($type === 'canceled_order_retry_next') {
+                [$succ,$err] = refill\util::retry_canceled_order($order_id,true);
                 $this->log("预回调订单失败补快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
             } else {
                 continue;

helper/refill/util.php

@@ -739,7 +739,7 @@ class util
         });
     }
 
-    public static function retry_canceled_order($order_id)
+    public static function retry_canceled_order($order_id, $skip)
     {
         $mod_order = Model('vr_order');
         $mod_refill = Model('refill_order');
@@ -771,6 +771,12 @@ class util
             $params = $order->queue_params();
             $params['order_time'] = time();
 
+            if ($skip) {
+                $mchid = $refill_info['mchid'];
+                $mch_order = $refill_info['mch_order'];
+                refill\util::set_next_order($mchid, $mch_order);
+            }
+
             if(util::push_add($params)) {
                 return [true,''];
             } else {