admin update

admin/control/merchant.php

@@ -873,10 +873,6 @@ class merchantControl extends SystemControl
         $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time desc');
 
         $stat = $this->all_order_state_stat($condition);
-        $count = $this->refill_stat($condition ,
-            [['between', [(time() - 3600) , (time() - 1800)]],
-                ['lt', (time() - 3600)]]
-        );
         foreach ($order_list as $order_id => $order_info)
         {
             $order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
@@ -895,7 +891,6 @@ class merchantControl extends SystemControl
         $provider_list = Model('')->table('refill_provider,store')->field('refill_provider.*,store.store_name')->join('inner')->on('store.store_id=refill_provider.store_id')->limit(100)->select();
 
         Tpl::output('stat', $stat);
-        Tpl::output('count', $count);
         Tpl::output('order_list', $order_list);
         Tpl::output('provider_list', $provider_list);
         Tpl::output('merchant_list', $merchant_list);
@@ -1402,10 +1397,10 @@ class merchantControl extends SystemControl
             ->on('refill_order.order_id=vr_order.order_id')
             ->field('count(*) as order_count ,sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
             ->where($condition)->find();
-        $count = $this->refill_stat($condition , [
-            ['between', [(time() - 300) , (time() - 180)]],
-            ['lt', (time() - 300)]
-        ]);
+        $count = $this->refill_stat($condition ,
+            [['between', [(time() - 3600) , (time() - 1800)]],
+                ['lt', (time() - 3600)]]
+        );
         foreach ($order_list as $order_id => $order_info) {
             $order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
             $order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];

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

@@ -241,10 +241,10 @@
                     <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
                     <td class="align-right">
                         <?php if(empty($order['notify_time'])) {
-                            if($order['diff_time'] >= 180 && $order['diff_time'] <= 300) {
+                            if($order['diff_time'] >= 1800 && $order['diff_time'] <= 3600) {
                         ?>
                                 <span style="color: #fd9d0e"><?php echo $order['diff_time_text']?></span>
-                            <?php }elseif($order['diff_time'] > 300) {?>
+                            <?php }elseif($order['diff_time'] > 3600) {?>
                                 <span style="color: #f30707"><?php echo $order['diff_time_text']?></span>
                             <?php }else{?>
                                 <?php echo $order['diff_time_text']?>

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

@@ -36,8 +36,8 @@
                 <ul>
                     <li class="lineLi" style="color:#000;">总计充值金额：<?php echo $output['stat']['refill_amounts'] ?? 0?></li>
                     <li class="lineLi" style="color:#000;">总计订单数量：<?php echo $output['stat']['order_count'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">超过3分钟订单数量：<?php echo $output['count'][0] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">超过5分钟订单数量：<?php echo $output['count'][1] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">超过30分钟订单数量：<?php echo $output['count'][0] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">超过1小时订单数量：<?php echo $output['count'][1] ?? 0?></li>
                 </ul>
             </td>
         </tr>
@@ -80,10 +80,10 @@
                     <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
                     <td class="align-right">
                         <?php if(empty($order['notify_time'])) {
-                            if($order['diff_time'] >= 180 && $order['diff_time'] <= 300) {
+                            if($order['diff_time'] >= 1800 && $order['diff_time'] <= 3600) {
                         ?>
                                 <span style="color: #fd9d0e"><?php echo $order['diff_time_text']?></span>
-                            <?php }elseif($order['diff_time'] > 300) {?>
+                            <?php }elseif($order['diff_time'] > 3600) {?>
                                 <span style="color: #f30707"><?php echo $order['diff_time_text']?></span>
                             <?php }else{?>
                                 <?php echo $order['diff_time_text']?>
@@ -152,7 +152,7 @@
             elem: '#endTime',
             type: 'datetime'
         });
-        let isWring = '<?php echo $output['count']['exceed_five'];?>';
+        let isWring = '<?php echo $output['count'][1];?>';
         // console.log('isWring', Number(isWring));
         let setTimer
         let num