shish 1 anno fa
parent
commit
511464c125

+ 8 - 0
app-ghs/controllers/LiveOrderController.php

@@ -4,6 +4,7 @@ namespace ghs\controllers;
 
 use bizGhs\live\classes\LiveOrderClass;
 use bizGhs\product\classes\ProductClass;
+use common\components\dateUtil;
 use common\components\util;
 use Yii;
 
@@ -20,6 +21,13 @@ class LiveOrderController extends BaseController
         if (!empty($staffId)) {
             $where['staffId'] = $staffId;
         }
+        $searchTime = $get['searchTime'] ?? '';
+        if (!empty($searchTime)) {
+            $startTime = $get['startTime'] ?? '';
+            $endTime = $get['endTime'] ?? '';
+            $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
+            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
+        }
         $respond = LiveOrderClass::getOrderList($where);
         util::success($respond);
     }

+ 2 - 0
biz-ghs/live/classes/LiveOrderClass.php

@@ -37,6 +37,7 @@ class LiveOrderClass extends BaseClass
         $itemId = $product->id ?? 0;
         $ptItemId = $product->itemId ?? 0;
         $itemName = $product->name ?? '';
+        $itemPy = $product->py ?? '';
         $itemCover = $product->cover ?? '';
         $customList = $params['customList'];
         $staffId = $params['staffId'] ?? 0;
@@ -53,6 +54,7 @@ class LiveOrderClass extends BaseClass
             'itemId' => $itemId,
             'ptItemId' => $ptItemId,
             'itemName' => $itemName,
+            'itemPy' => $itemPy,
             'itemCover' => $itemCover,
             'customNum' => $customNum,
             'itemNum' => $itemNum,