Browse Source

补单监控,已取消检索中过滤已返销

lowkeyman 1 month ago
parent
commit
a53e8246e9
1 changed files with 9 additions and 1 deletions
  1. 9 1
      admin/control/ordersendlist.php

+ 9 - 1
admin/control/ordersendlist.php

@@ -280,10 +280,18 @@ class ordersendlistControl extends SystemControl
         {
             $base_cond['refill_order.mch_order'] = ['in', $buyback_mch_orders];
         }
-        else if (in_array($_GET['order_state'], ['0', '30', '40']))
+        else if (in_array($_GET['order_state'], ['30', '40']))
         {
             $base_cond['vr_order.order_state'] = intval($_GET['order_state']);
         }
+        else if ($_GET['order_state'] === '0')
+        {
+            $base_cond['vr_order.order_state'] = intval($_GET['order_state']);
+
+            if (!empty($buyback_mch_orders)) {
+                $base_cond['refill_order.mch_order'] = ['not in', $buyback_mch_orders];
+            }
+        }
         else if (empty($order_state))
         { //没选择订单状态,默认只显示充值中和已取消(未返销)
             $base_cond['vr_order.order_state'] = ['in', [ORDER_STATE_CANCEL, ORDER_STATE_SEND]];