admin update

admin/control/merchant.php

@@ -1114,6 +1114,8 @@ class merchantControl extends SystemControl
 
             $retry_times_data = function ($qualitys){
                 $qualities = [];
+                $day_secs_total = 0;
+                $night_secs_total = 0;
                 foreach ($qualitys as $quality) {
                     $quality = intval($quality);
                     $day_secs_key = "{$quality}-day_secs";
@@ -1121,6 +1123,8 @@ class merchantControl extends SystemControl
                     $times_key = "{$quality}-times";
                     if(!empty($_POST[$day_secs_key]) && !empty($_POST[$night_secs_key]) && !empty($_POST[$times_key])) {
                         $qualities[$quality] = ['day_secs' => intval($_POST[$day_secs_key]), 'night_secs' => intval($_POST[$night_secs_key]), 'times' => intval($_POST[$times_key])];
+                        $day_secs_total += $_POST[$day_secs_key];
+                        $night_secs_total += $_POST[$night_secs_key];
                     }
                 }
                 $retry_times_cfg['qualities'] = $qualities;
@@ -1131,13 +1135,21 @@ class merchantControl extends SystemControl
                 $retry_times_cfg['profit_ratio'] = $profit_ratio;
                 $profit_formula = $_POST['profit_formula'] ?? '';
                 $retry_times_cfg['profit_formula'] = $profit_formula;
-                return serialize($retry_times_cfg);
+                return [serialize($retry_times_cfg), $day_secs_total, $night_secs_total];
             };
+            [$retry_times_cfg, $day_secs_total, $night_secs_total] = $retry_times_data($qualitys);
 
             $update['quality'] = intval($_POST['quality']);
             $update['oil_quality'] = intval($_POST['oil_quality']);
             $update['intercept_cfg'] = $intercept_data();
-            $update['retry_times_cfg'] = $retry_times_data($qualitys);
+            $update['retry_times_cfg'] = $retry_times_cfg;
+            if(!empty($day_secs_total)) {
+                $update['day_timeout'] = $day_secs_total;
+            }
+            if(!empty($night_secs_total)) {
+                $update['night_timeout'] = $night_secs_total;
+            }
+
             $resp = $model_merchant->editMerchant($update, ['mchid' => $mchid]);
             if ($resp) {
                 showMessage('操作成功', 'index.php?act=merchant&op=merchant');

admin/control/orderstats.php

@@ -12,6 +12,7 @@ class orderstatsControl extends SystemControl
     {
         $type = $_GET['type'] ?? 'system';
         $page = "{$type}.order.stats";
+        $_GET['query_start_time'] = $_GET['query_start_time'] ?? date("Y-m-d 00:00:00", strtotime("-1 day"));
         $model_refill_order = Model('refill_order');
         $condition['type'] = $type;
         if (!empty($_GET['cid'])) {