refill search add where order_state

admin/control/order_search.php

@@ -13,6 +13,12 @@ class order_searchControl extends SystemControl
         $model_refill_order = Model('refill_order');
         $order_list = [];
         $_GET['query_start_time'] = $_GET['query_start_time'] ?? date("Y-m-d 00:00:00");
+
+        if (in_array($_GET['order_state'], ['0', '10', '20', '30', '40']))
+        {
+            $condition['vr_order.order_state'] = $_GET['order_state'];
+        }
+
         //批量查询，二者都有，以卡号为主
         if(!empty($_GET['card_nos'])) {
             $card_nos = trim($_GET['card_nos'], ',');
@@ -20,9 +26,8 @@ class order_searchControl extends SystemControl
         } elseif (!empty($_GET['mch_orders'])) {
             $mch_orders = rtrim($_GET['mch_orders'], ',');
             $condition['refill_order.mch_order'] = ['in', $mch_orders];
-        } else {
-            $condition = [];
         }
+
         if(!empty($condition)) {
             $condition['refill_order.inner_status'] = 0;
 

admin/templates/default/refill.order.search.php

@@ -64,6 +64,24 @@
                 </td>
             </tr>
             <tr>
+                <th><label>订单状态</label></th>
+                <td>
+                    <select name="order_state" class="querySelect">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="10"
+                                <?php if ($_GET['order_state'] == '10'){ ?>selected<?php } ?>><?php echo $lang['order_state_new']; ?></option>
+                        <option value="20"
+                                <?php if ($_GET['order_state'] == '20'){ ?>selected<?php } ?>><?php echo $lang['order_state_pay']; ?></option>
+                        <option value="30"
+                                <?php if ($_GET['order_state'] == '30'){ ?>selected<?php } ?>><?php echo $lang['order_state_send']; ?></option>
+                        <option value="40"
+                                <?php if ($_GET['order_state'] == '40'){ ?>selected<?php } ?>><?php echo $lang['order_state_success']; ?></option>
+                        <option value="0"
+                                <?php if ($_GET['order_state'] == '0'){ ?>selected<?php } ?>><?php echo $lang['order_state_cancel']; ?></option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
                 <td></td>
                 <td>
                     <a href="#" class="btns" onclick="hCopyCardNo(event)">