mch orderstat

mchsrv/control/merchant_order.php

@@ -122,8 +122,8 @@ class merchant_orderControl extends mbMerchantControl
             }
         }
         if(!empty($stats)) {
+            $success_count = $success_amounts = $cancel_count = $except_count = 0;
             foreach ($stats as $stat) {
-                $success_count = $success_amounts = $cancel_count = $except_count = 0;
                 $hour = $stat['hour'];
                 if ($stat['order_state'] == ORDER_STATE_SUCCESS) {
                     $success_count = $stat['order_count'];
@@ -135,14 +135,13 @@ class merchant_orderControl extends mbMerchantControl
                     $except_count = $except[$hour];
                 }
                 $data[$hour] = ['success_count' => $success_count, 'success_amounts' => $success_amounts, 'cancel_count' => $cancel_count, 'except_count' => $except_count];
-
-                $all['success_count'] += $success_count;
-                $all['success_amounts'] += ncPriceFormat($success_amounts);
-                $all['cancel_count'] += ncPriceFormat($cancel_count);
-                $all['except_count'] += ncPriceFormat($except_count);
             }
             foreach ($data as $hour => $val) {
                 $result[] = [$hour, $val['success_count'], $val['success_amounts'], $val['cancel_count'], $val['except_count']];
+                $all['success_count'] += $val['success_count'];
+                $all['success_amounts'] += ncPriceFormat($val['success_amounts']);
+                $all['cancel_count'] += ncPriceFormat($val['cancel_count']);
+                $all['except_count'] += ncPriceFormat($val['except_count']);
             }
             $result[] = ['总计', $all['success_count'], $all['success_amounts'], $all['cancel_count'], $all['except_count']];
         }