浏览代码

admin refill order add count

ayHaru 4 年之前
父节点
当前提交
3679e9bf0c
共有 2 个文件被更改,包括 20 次插入8 次删除
  1. 11 3
      admin/control/merchant.php
  2. 9 5
      admin/templates/default/refill.order.index.php

+ 11 - 3
admin/control/merchant.php

@@ -571,7 +571,6 @@ class merchantControl extends SystemControl
         $start_unixtime = $if_start_time ? strtotime($_GET['query_start_time']) : null;
         $end_unixtime = $if_end_time ? strtotime($_GET['query_end_time']) : null;
         if ($start_unixtime || $end_unixtime) {
-            $condition['refill_order.order_time'] = array('time', array($start_unixtime, $end_unixtime));
             $condition['refill_order.order_time'] = ['time', [$start_unixtime, $end_unixtime]];
         }
         $merchant_list = Model('')->table('merchant')->select();
@@ -582,9 +581,9 @@ class merchantControl extends SystemControl
 
         $stat = Model('')->table('refill_order,vr_order')->join('inner')
             ->on('refill_order.order_id=vr_order.order_id')
-            ->field('sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
+            ->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)->select();
-
+        $half_count = $hour_count = 0;
         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'];
@@ -597,9 +596,18 @@ class merchantControl extends SystemControl
             {
                 $order_list[$order_id]['diff_time_text'] = $this->elapse_time(time() - $order_info['order_time']);
                 $order_list[$order_id]['diff_time'] = time() - $order_info['order_time'];
+                if($order_info['order_state'] == ORDER_STATE_SEND) {
+                    if($order_list[$order_id]['diff_time'] > 1800 && $order_list[$order_id]['diff_time'] < 3600) {
+                        $half_count++;
+                    }
+                    if($order_list[$order_id]['diff_time'] > 3600) {
+                        $hour_count++;
+                    }
+                }
             }
         }
         Tpl::output('stat', $stat[0]);
+        Tpl::output('count', ['half_count' => $half_count , 'hour_count' => $hour_count]);
         Tpl::output('order_list', $order_list);
         Tpl::output('show_page', $model_refill_order->showpage());
         Tpl::showpage('refill.order.index');

+ 9 - 5
admin/templates/default/refill.order.index.php

@@ -110,11 +110,15 @@
           </tr>
           <tr>
             <td>
-            <ul>
-                <li>总计充值金额:<?php echo $output['stat']['refill_amounts'] ?? 0?></li>
-                <li>总计渠道扣款金额:<?php echo $output['stat']['channel_amounts'] ?? 0?></li>
-                <li>总计机构扣款金额:<?php echo $output['stat']['mch_amounts'] ?? 0?></li>
-              </ul></td>
+                <ul>
+                    <li>总计充值金额:<?php echo $output['stat']['refill_amounts'] ?? 0?></li>
+                    <li>总计渠道扣款金额:<?php echo $output['stat']['channel_amounts'] ?? 0?></li>
+                    <li>总计机构扣款金额:<?php echo $output['stat']['mch_amounts'] ?? 0?></li>
+                    <li>总计订单数量:<?php echo $output['stat']['order_count'] ?? 0?></li>
+                    <li>超过半小时订单数量:<?php echo $output['count']['half_count'] ?? 0?></li>
+                    <li>超过一小时订单数量:<?php echo $output['count']['hour_count'] ?? 0?></li>
+                </ul>
+            </td>
           </tr>
         </tbody>
       </table>