admin update

admin/control/orderstats.php

@@ -41,10 +41,10 @@ class orderstatsControl extends SystemControl
             Tpl::output('merchant_list', $merchant_list);
         }
         $total_stats = $this->stats($stats_list);
-        $check_text = ['未编辑', '匹配', '不匹配'];
+        $order_time_type_text = ['notify_time' => '回调时间', 'order_time' => '下单时间'];
         Tpl::output('total_stats', $total_stats);
         Tpl::output('stats_list', $stats_list);
-        Tpl::output('check_text', $check_text);
+        Tpl::output('order_time_type_text', $order_time_type_text);
         Tpl::output('show_page', $model_refill_order->showpage());
         Tpl::showpage($page);
     }

admin/templates/default/merchant.order.stats.php

@@ -140,6 +140,7 @@
                 <th class="align-center">金额误差</th>
                 <th class="align-center">备注</th>
                 <th class="align-center">匹配状态</th>
+                <th class="align-center">统计日期类型</th>
                 <th class="align-center"><?php echo $lang['operation']; ?></th>
             </tr>
             </thead>
@@ -172,6 +173,7 @@
                                 <span style="color: #fd9d0e">未编辑</span>
                             <?php }?>
                         </td>
+                        <td class="align-center"><?php echo $output['order_time_type_text'][$v['order_time_type']]; ?></td>
                         <td class="align-center w200">
                             <a href="index.php?act=merchant&op=OrderStatsReload&stat_id=<?php echo $v['stat_id'];?>">重新统计</a>
                             |<a href="index.php?act=merchant&op=OrderStatsCheck&stat_id=<?php echo $v['stat_id'] ?>">编辑</a>

admin/templates/default/provider.order.stats.php

@@ -140,6 +140,7 @@
                 <th class="align-center">金额误差</th>
                 <th class="align-center">备注</th>
                 <th class="align-center">匹配状态</th>
+                <th class="align-center">统计日期类型</th>
                 <th class="align-center"><?php echo $lang['operation']; ?></th>
             </tr>
             </thead>
@@ -172,6 +173,7 @@
                                 <span style="color: #fd9d0e">未编辑</span>
                             <?php }?>
                         </td>
+                        <td class="align-center"><?php echo $output['order_time_type_text'][$v['order_time_type']]; ?></td>
                         <td class="align-center w200">
                             <a href="index.php?act=merchant&op=OrderStatsReload&stat_id=<?php echo $v['stat_id'];?>">重新统计</a>
                             |<a href="index.php?act=merchant&op=OrderStatsCheck&stat_id=<?php echo $v['stat_id'] ?>">编辑</a>

admin/templates/default/system.order.stats.php

@@ -114,6 +114,7 @@
                 <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>-->
             </tr>
             </thead>
@@ -133,6 +134,7 @@
                         <td class="align-center"><?php echo $v['order_count']; ?></td>
                         <td class="align-center"><?php echo $v['cancel_count']; ?></td>
                         <td class="align-center"><?php echo $v['success_ratio']; ?></td>
+                        <td class="align-center"><?php echo $output['order_time_type_text'][$v['order_time_type']]; ?></td>
 <!--                        <td class="align-center w200">-->
 <!--                            <a href="index.php?act=merchant&op=OrderStatsReload&stat_id=--><?php //echo $v['stat_id'];?><!--">重新统计</a>-->
 <!--                        </td>-->