stat_refill

helper/statistics/stat_refill.php

@@ -85,8 +85,12 @@ class stat_refill
     {
         $cond = [
             'refill_order.inner_status' => 0,
-            "refill_order.{$order_time_type}&refill_order.{$order_time_type}" => ['_multi' => true, ['egt', $day_time], ['lt', $day_time + stat_refill::DaySecs]]
+            "refill_order.{$order_time_type}&refill_order.{$order_time_type}" => ['_multi' => true, ['egt', $day_time], ['lt', $day_time + stat_refill::DaySecs]],
+            "vr_order.add_time&vr_order.add_time" => ['_multi' => true, ['egt', $day_time - stat_refill::DaySecs], ['lt', $day_time + stat_refill::DaySecs]]
         ];
+        if ($order_time_type == 'notify_time') {
+            $cond['refill_order.order_time&refill_order.order_time'] = ['_multi' => true, ['egt', $day_time - stat_refill::DaySecs], ['lt', $day_time + stat_refill::DaySecs]];
+        }
 
         $items = Model('')->table('refill_order,vr_order')
             ->field('order_state, count(*) as order_count, sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
@@ -154,7 +158,11 @@ class stat_refill
         $cond = [
             'refill_order.inner_status' => 0,
             "refill_order.{$order_time_type}&refill_order.{$order_time_type}" => ['_multi' => true, ['egt', $day_time], ['lt', $day_time + stat_refill::DaySecs]],
+            "vr_order.add_time&vr_order.add_time" => ['_multi' => true, ['egt', $day_time - stat_refill::DaySecs], ['lt', $day_time + stat_refill::DaySecs]]
         ];
+        if ($order_time_type == 'notify_time') {
+            $cond['refill_order.order_time&refill_order.order_time'] = ['_multi' => true, ['egt', $day_time - stat_refill::DaySecs], ['lt', $day_time + stat_refill::DaySecs]];
+        }
 
         foreach ($this->mMerchantNames as $mchid => $cname)
         {
@@ -209,7 +217,11 @@ class stat_refill
         $cond = [
             'refill_order.inner_status' => 0,
             "refill_order.{$order_time_type}&refill_order.{$order_time_type}" => ['_multi' => true, ['egt', $day_time], ['lt', $day_time + stat_refill::DaySecs]],
+            "vr_order.add_time&vr_order.add_time" => ['_multi' => true, ['egt', $day_time - stat_refill::DaySecs], ['lt', $day_time + stat_refill::DaySecs]]
         ];
+        if ($order_time_type == 'notify_time') {
+            $cond['refill_order.order_time&refill_order.order_time'] = ['_multi' => true, ['egt', $day_time - stat_refill::DaySecs], ['lt', $day_time + stat_refill::DaySecs]];
+        }
 
         foreach ($this->mProviderNames as $store_id => $cname)
         {