Merge branch 'oilrun' of 39.97.239.116:gyfl/xyzshop into oilrun

admin/control/merchant.php

@@ -545,16 +545,19 @@ class merchantControl extends SystemControl
     {
         $model_refill_order = Model('refill_order');
         $condition['inner_status'] = 0;
-        if ($_GET['order_sn']) {
+        if (!empty($_GET['order_sn'])) {
             $condition['refill_order.order_sn'] = $_GET['order_sn'];
         }
-        if ($_GET['mchid']) {
+        if (!empty($_GET['mchid'])) {
             $condition['refill_order.mchid'] = $_GET['mchid'];
         }
-        if ($_GET['card_type']) {
+        if (!empty($_GET['card_type'])) {
             $condition['refill_order.card_type'] = $_GET['card_type'];
         }
-        if ($_GET['card_no']) {
+        if (!empty($_GET['ch_trade_no'])) {
+            $condition['refill_order.ch_trade_no'] = $_GET['ch_trade_no'];
+        }
+        if (!empty($_GET['card_no'])) {
             $condition['refill_order.card_no'] = $_GET['card_no'];
         }
         if (in_array($_GET['order_state'], array('0', '10', '20', '30', '40'))) {

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

@@ -59,6 +59,8 @@
                            id="query_end_time" name="query_end_time"/></td>
                 <th><label>充值卡卡号</label></th>
                 <td><input class="txt2" type="text" name="card_no" value="<?php echo $_GET['card_no']; ?>"/></td>
+                <th><label>渠道单号</label></th>
+                <td><input class="txt2" type="text" name="ch_trade_no" value="<?php echo $_GET['ch_trade_no']; ?>"/></td>
                 <td><a href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;</a>