dev

admin/control/refill_order_manual.php

@@ -466,7 +466,10 @@ class refill_order_manualControl extends SystemControl
 
         $mchids[] = 1092;
         $condition['inner_status'] = 0;
-        $condition['mchid'] = ['in', $mchids];
+        if(!empty($mchids)) {
+            $condition['mchid'] = ['in', $mchids];
+        }
+
         $condition['vr_order.add_time&vr_order.add_time'] = ['_multi' => true,
             ['egt', $start_day],
             ['lt', $cur_time]];
@@ -506,8 +509,8 @@ class refill_order_manualControl extends SystemControl
                 $this->log("预回调订单转快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
             }
             elseif ($type === 'cancel_order_retry') {
-                refill\util::retry_canceled_order($order_id);
-                $this->log("预回调订单失败补快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
+                [$succ,$err] = refill\util::retry_canceled_order($order_id);
+                $this->log("预回调订单失败补快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid} err:{$err}");
             } else {
                 continue;
             }