transfer order page add order_time cond

admin/control/refill_order_manual.php

@@ -445,6 +445,7 @@ class refill_order_manualControl extends SystemControl
         $mod = Model('refill_order');
         $cur_time = time();
         $start_day = $cur_time - 86400 * 2;
+        $end_day = $cur_time;
 
         if (!empty($input['mch_orders'])) {
             $mch_orders = rtrim($input['mch_orders'],',');
@@ -473,13 +474,19 @@ class refill_order_manualControl extends SystemControl
         else {
             return [];
         }
+        if(!empty($input['query_start_time'])) {
+            $start_day = strtotime($input['query_start_time']);
+        }
+        if(!empty($input['query_end_time'])) {
+            $end_day = strtotime($input['query_end_time']);
+        }
 
         $condition['vr_order.add_time&vr_order.add_time'] = ['_multi' => true,
             ['egt', $start_day],
-            ['lt', $cur_time]];
+            ['lt', $end_day]];
         $condition['refill_order.order_time&refill_order.order_time'] = ['_multi' => true,
             ['egt', $start_day],
-            ['lt', $cur_time]];
+            ['lt', $end_day]];
 
         $merchant_list = $this->merchants(['mchid' => ['in', $mchids]]);
         $order_list = $mod->getMerchantOrderList($condition, 200, 0,'refill_order.*,vr_order.order_state', 'refill_order.order_time desc');

admin/templates/default/transfer.order.php

@@ -105,6 +105,14 @@
         <input type="hidden" name="op" value="transfer_order" />
         <table class="tb-type1 noborder search">
             <tr>
+                <th><label for="query_start_time">下单时间</label></th>
+                <td style="width: 380px">
+                    <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>"
+                           id="startTime" name="query_start_time" autocomplete="off" style="width:120px"/>
+                    <label for="query_start_time">~</label>
+                    <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>"
+                           id="endTime" name="query_end_time" autocomplete="off" style="width:120px"/>
+                </td>
                 <th><label>客户名称</label></th>
                 <td class="layui-form">
                     <select name="mchid" class="querySelect" lay-verify="" lay-search>

admin/templates/default/transfer.order.recharge.php

@@ -105,6 +105,14 @@
         <input type="hidden" name="op" value="transfer_order_recharge" />
         <table class="tb-type1 noborder search">
             <tr>
+                <th><label for="query_start_time">下单时间</label></th>
+                <td style="width: 380px">
+                    <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>"
+                           id="startTime" name="query_start_time" autocomplete="off" style="width:120px"/>
+                    <label for="query_start_time">~</label>
+                    <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>"
+                           id="endTime" name="query_end_time" autocomplete="off" style="width:120px"/>
+                </td>
                 <th><label>客户名称</label></th>
                 <td class="layui-form">
                     <select name="mchid" class="querySelect" lay-verify="" lay-search>