refill buyback list

admin/control/refill_order_manual.php

@@ -395,7 +395,6 @@ class refill_order_manualControl extends SystemControl
     public function refill_buybackOp()
     {
         $model_refill_order = Model('refill_order');
-        $order_list = [];
         if(!empty($_GET['card_nos'])) {
             $card_nos = trim($_GET['card_nos'], ',');
             $condition['refill_order.card_no'] = ['in', $card_nos];
@@ -404,12 +403,15 @@ class refill_order_manualControl extends SystemControl
             $order_sns = trim($_GET['order_sns'], ',');
             $condition['refill_order.order_sn'] = ['in', $order_sns];
         }
-        if(!empty($condition)) {
-            $condition['inner_status'] = 0;
-            $merchant_list = $this->merchants();
-            $order_list = $model_refill_order->getBuyBackList($condition, 50, 'refill_buyback.*,refill_order.*,vr_order.order_state', 'refill_order.order_time desc','',true);
-            $order_list = $this->OrderDataFormat($order_list, $merchant_list);
+        if(!empty($_GET['manual_type']))
+        {
+            $condition['manual_type'] = $_GET['manual_type'];
         }
+        $condition['inner_status'] = 0;
+        $merchant_list = $this->merchants();
+        $order_list = $model_refill_order->getBuyBackList($condition, 50, 'refill_buyback.*,refill_order.*,vr_order.order_state', 'refill_buyback.order_id desc','',true);
+        $order_list = $this->OrderDataFormat($order_list, $merchant_list);
+
         Tpl::output('order_list', $order_list);
         Tpl::showpage('refill.buyback.order');
     }

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

@@ -46,19 +46,31 @@
         <table class="tb-type1 noborder search" style="min-width:1400px">
             <tbody>
             <tr>
-            <th><label style="width:122px">订单号（多行查询）</label></th>
-                <td style="width: 227px;"><textarea  name="order_sns" id="order_sns" cols="30"
-                              rows="10"><?php echo $_GET['order_sns']; ?></textarea>
+                <th><label style="width:122px">订单号（多行查询）</label></th>
+                <td style="width: 227px;">
+                    <textarea name="order_sns" id="order_sns" cols="30" rows="10"><?php echo $_GET['order_sns']; ?></textarea>
                 </td>
-            <th><label style="width:122px">充值卡号（多行查询）</label></th>
-                <td style="width: 227px;"><textarea name="card_nos" id="card_nos" cols="30"
-                              rows="10"><?php echo $_GET['card_nos']; ?></textarea></td>
-                              <td>
-                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
-                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
-                    </a>
+                <th><label style="width:122px">充值卡号（多行查询）</label></th>
+                <td style="width: 227px;">
+                    <textarea name="card_nos" id="card_nos" cols="30" rows="10"><?php echo $_GET['card_nos']; ?></textarea>
+                </td>
+                <th><label>操作类型</label></th>
+                <td style="width:122px">
+                    <select name="manual_type">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="buyback"
+                                <?php if ($_GET['manual_type'] == 'buyback'){ ?>selected<?php } ?>>返销</option>
+                        <option value="success"
+                                <?php if ($_GET['manual_type'] == 'success'){ ?>selected<?php } ?>>手动成功</option>
+                        <option value="cancel"
+                                <?php if ($_GET['manual_type'] == 'cancel'){ ?>selected<?php } ?>>手动失败</option>
+                    </select>
+                </td>
+                <td>
+                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search" title="<?php echo $lang['nc_query']; ?>">&nbsp;</a>
                 </td>
             </tr>
+
             </tbody>
         </table>
     </form>
@@ -67,19 +79,19 @@
         <tr class="thead">
             <th class="align-center">编号</th>
             <th class="align-center">订单号</th>
-            <th class="align-center">机构编号</th>
-            <th class="align-center">机构名称</th>
-            <th class="align-center">充值卡号</th>
+            <th class="align-left">机构编号</th>
+            <th class="align-left">机构名称</th>
+            <th class="align-left">充值卡号</th>
             <th class="align-center">充值卡类型</th>
             <th class="align-center">充值额度</th>
-            <th class="align-right">下单日期</th>
+            <th class="align-center">下单日期</th>
             <th class="align-center">订单状态</th>
-            <th class="align-center">运营商流水号</th>
-            <th class="align-center">商家单号</th>
-            <th class="align-center">渠道单号</th>
-            <th class="align-center">渠道名称</th>
-            <th class="align-right">操作类型</th>
-            <th class="align-center">操作人</th>
+            <th class="align-left">运营商流水号</th>
+            <th class="align-left">商家单号</th>
+            <th class="align-left">渠道单号</th>
+            <th class="align-left">渠道名称</th>
+            <th class="align-left">操作类型</th>
+            <th class="align-left">操作人</th>
             <th class="align-center">操作日期</th>
             <th class="align-center">备注</th>
             <!--            <th class="align-center">扣款金额</th>-->
@@ -92,20 +104,20 @@
             foreach ($output['order_list'] as $key => $order) { ?>
                 <tr class="hover trFlex">
                     <td class="align-center"><?php echo $key+1;?></td>
-                    <td class="align-left"><?php echo $order['order_sn']; ?></td>
-                    <td class="align-center"><?php echo $order['mchid']; ?></td>
-                    <td class="align-center"><?php echo $order['mch_name']; ?></td>
+                    <td class="align-center"><?php echo $order['order_sn']; ?></td>
+                    <td class="align-left"><?php echo $order['mchid']; ?></td>
+                    <td class="align-left"><?php echo $order['mch_name']; ?></td>
                     <td class="align-left"><?php echo $order['card_no']; ?></td>
                     <td class="align-center"><?php echo $order['card_type_text']; ?></td>
                     <td class="align-center"><?php echo $order['refill_amount']; ?></td>
-                    <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
+                    <td class="align-center"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
                     <td class="align-left"><?php echo $order['official_sn']; ?></td>
                     <td class="align-left"><?php echo $order['mch_order']; ?></td>
                     <td class="align-left" class="ch_trade_no"><?php echo $order['ch_trade_no']; ?></td>
-                    <td class="align-center"><?php echo $order['channel_name']; ?></td>
-                    <td class="align-right"><?php echo $order['manual_type']; ?></td>
-                    <td class="align-center"><?php echo $order['admin_name']; ?></td>
+                    <td class="align-left"><?php echo $order['channel_name']; ?></td>
+                    <td class="align-left"><?php echo $order['manual_type']; ?></td>
+                    <td class="align-left"><?php echo $order['admin_name']; ?></td>
                     <td class="align-center"><?php echo date('Y-m-d H:i:s', $order['act_time']); ?></td>
                     <td class="align-center"><?php echo $order['bz']; ?></td>
                     <!--                    <td class="align-center">--><?php //echo $order['mch_amount']; ?><!--</td>-->