结账

biz-ghs/stat/classes/StatSaleClass.php

@@ -59,34 +59,26 @@ class StatSaleClass extends BaseClass
         $get = Yii::$app->request->get();
         $where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
 
-        if (isset($get['payTime']) && !empty($get['payTime'])) {
-            $payTime = $get['payTime'];
+        $timeStyle = $get['timeStyle'] ?? 0;
 
-            $startTime = $get['startTime'] ?? '';
-            $endTime = $get['endTime'] ?? '';
-            $period = dateUtil::formatTime($payTime, $startTime, $endTime, true);
-            $start = $period['startTime'];
-            $end = $period['endTime'];
-            $currentStartDate = date('Y-m-d', strtotime($start));
-            $currentEndDate = date('Y-m-d', strtotime($end));
-            $currentStartTime = $currentStartDate . ' 00:00:00';
-            $currentEndTime = $currentEndDate . ' 23:59:59';
-            $where['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
-
-        } elseif (isset($get['clearTime']) && !empty($get['clearTime'])) {
-            $clearTime = $get['clearTime'];
+        if (isset($get['searchTime']) && !empty($get['searchTime'])) {
+            $searchTime = $get['searchTime'];
 
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';
-            $period = dateUtil::formatTime($clearTime, $startTime, $endTime, true);
+            $period = dateUtil::formatTime($searchTime, $startTime, $endTime, true);
             $start = $period['startTime'];
             $end = $period['endTime'];
             $currentStartDate = date('Y-m-d', strtotime($start));
             $currentEndDate = date('Y-m-d', strtotime($end));
             $currentStartTime = $currentStartDate . ' 00:00:00';
             $currentEndTime = $currentEndDate . ' 23:59:59';
-            $where['clearTime'] = ['between', [$currentStartTime, $currentEndTime]];
 
+            if ($timeStyle == 0) {
+                $where['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
+            } else {
+                $where['clearTime'] = ['between', [$currentStartTime, $currentEndTime]];
+            }
         } else {
             $payTime = 'today';
 
@@ -101,6 +93,7 @@ class StatSaleClass extends BaseClass
             $currentEndTime = $currentEndDate . ' 23:59:59';
             $where['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
         }
+
         $customId = $get['customId'] ?? 0;
         if (!empty($customId)) {
             $where['customId'] = $customId;