recharge autocomplete=off and orderstat reload update

admin/control/merchant.php

@@ -9,6 +9,7 @@ defined('InShopNC') or exit('Access Invalid!');
 include(BASE_CONFIG_PATH . CONFIG_PREFIX . '/refill.ini.php');
 require_once(BASE_HELPER_PATH . '/stat_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/refill/functional.php');
+require_once(BASE_HELPER_PATH . '/task/task_helper.php');
 
 class merchantControl extends SystemControl
 {
@@ -1051,20 +1052,19 @@ class merchantControl extends SystemControl
         if (empty($stats_data)) {
             showMessage('对应数据不存在', '');
         }
-        $refill = new statistics\stat_refill();
-        try {
-            $trans = new trans_wapper($mod_stat, __METHOD__);
-            //更新新数据
-            if ($stats_data['type'] == 'merchant') {
-                $refill->merchant_stat($stats_data['time_stamp'], $stats_data['cid'], $stats_data['order_time_type']);
-            } elseif ($stats_data['type'] == 'provider') {
-                $refill->provider_stat($stats_data['time_stamp'], $stats_data['cid'], $stats_data['order_time_type']);
-            }
-            $trans->commit();
+        $cond = [
+            'type' => $stats_data['type'],
+            'time_stamp' => $stats_data['time_stamp'],
+            'cid' => $stats_data['cid'],
+            'order_time_type' => $stats_data['order_time_type']
+        ];
+        $manager = new task\manager();
+
+        $task = $manager->add_task('order_stat_reload',$cond,0,3600);
+        if ($task->completed() && $task->success()) {
             showMessage('操作成功');
-        } catch (Exception $e) {
-            $trans->rollback();
-            showMessage('操作失败');
+        } else {
+            showMessage("操作成功，后台任务已开始重新统计，请稍后查看新数据");
         }
     }
 

admin/control/ordersendlist.php

@@ -622,7 +622,7 @@ class ordersendlistControl extends SystemControl
             $condition['refill_order.notify_time'] = [['egt', $start_day], ['lt', ($cur_time - $notify_time)], 'and'];
         }
 
-        $order_list = $model_refill_order->getMerchantOrderList($condition, 200, 0,'refill_order.*,vr_order.order_state', '', 1000);
+        $order_list = $model_refill_order->getMerchantOrderList($condition, 200, 1000,'refill_order.*,vr_order.order_state', '', 1000);
         $merchant_list = $this->merchants();
         $order_list = $this->orderFormat($order_list, $merchant_list);
 

admin/templates/default/provider.recharge.php

@@ -38,7 +38,7 @@
                         <option value="add">增加</option>
                         <option value="del">减少</option>
                     </select>
-                    <input type="text" id="pointsnum" name="pointsnum" class="txt">
+                    <input type="text" autocomplete="off" id="pointsnum" name="pointsnum" class="txt">
                     <div id="money" style="color:red; display: inline-block"></div>
                 </td>
                 <td class="vatop tips"></td>

admin/templates/default/recharge.manual.add.php

@@ -58,7 +58,7 @@
                         <option value="add">增加</option>
                         <option value="del">减少</option>
                     </select>
-                    <input type="text" id="pointsnum" name="pointsnum" class="txt">
+                    <input type="text" autocomplete="off" id="pointsnum" name="pointsnum" class="txt">
                     <div id="money" style="color:red; display: inline-block"></div>
                 </td>
                 <td class="vatop tips"></td>

admin/templates/default/recharge.manual.edit.php

@@ -50,7 +50,7 @@
                         <option value="add">增加</option>
                         <option value="del">减少</option>
                     </select>
-                    <input type="text" id="pointsnum" name="pointsnum" class="txt">
+                    <input type="text" autocomplete="off" id="pointsnum" name="pointsnum" class="txt">
                     <div id="money" style="color:red; display: inline-block"></div>
                 </td>
                 <td class="vatop tips"></td>

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

@@ -46,6 +46,7 @@
     }
     .lefto {
         margin-left: 6px;
+        width: 127px;
     }
     .db-right {
         padding-right: 134px!important;
@@ -89,7 +90,7 @@
                         <?php } ?>
                     </select>
                 </td>
-                <th>回调时间</th>
+                <th style="padding-left: 15px;">回调时间</th>
                 <td>
                     <select name="notify_time" class="querySelect" id="arrangeClass">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>

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

@@ -455,7 +455,6 @@
         let str = ''
         $('#tbody tr').each(function () {
             let card_no = $(this).find('td').eq(4).text()
-            let channel_no = $(this).find('td').eq(15).text()
             str += card_no + '\n'
         })
         let oInput = document.createElement("textarea");

helper/task/handler.php

@@ -1,10 +1,12 @@
 <?php
 namespace task;
+require_once(BASE_HELPER_PATH . '/stat_helper.php');
 
 use Exception;
 use mtopcard;
 use PHPExcel;
 use PHPExcel_IOFactory;
+use statistics\stat_refill;
 
 class handler
 {
@@ -119,4 +121,24 @@ class handler
     {
         return md5("refill_order_export-".serialize($condition));
     }
+
+    public function order_stat_reload($condition)
+    {
+        $refill = new stat_refill();
+        $type = $condition['type'];
+        $time_stamp = $condition['time_stamp'];
+        $cid = $condition['cid'];
+        $order_time_type = $condition['order_time_type'];
+        if ($type == 'merchant') {
+            $refill->merchant_stat($time_stamp, $cid, $order_time_type);
+        } elseif ($type == 'provider') {
+            $refill->provider_stat($time_stamp, $cid, $order_time_type);
+        }
+        return [true, 'success'];
+    }
+
+    public function order_stat_reload_title($condition)
+    {
+        return md5("order_stat_reload-".serialize($condition));
+    }
 }