销售记录

biz-ghs/order/classes/OrderClass.php

@@ -294,10 +294,9 @@ class OrderClass extends BaseClass
     //根据编号列表查订单
     public static function getOrderInfoBySnList($snList)
     {
-        $where = ['orderSn' => ['in', $snList]];
-        $data = self::getList('*', $where, 'addTime DESC');
-        $data['list'] = self::groupOrder($data['list'], true, false, false, true);
-        return $data;
+        $list = self::getAllByCondition(['orderSn' => ['in', $snList]], null, '*', 'orderSn');
+        $list = self::groupOrder($list, true, false, false, true);
+        return $list;
     }
 
     //订单列表 ssh 2021.1.19

biz-ghs/order/classes/OrderItemClass.php

@@ -88,15 +88,16 @@ class OrderItemClass extends BaseClass
 
     public static function getOrderInfoList($where)
     {
-        $data = self::getList('orderSn,id', $where, 'id DESC');
-        $orderSnArr = [];
-        if (isset($data['list']) && !empty($data['list'])) {
-            $orderSnArr = array_unique(array_filter(array_column($data['list'], 'orderSn')));
-        }
-        if (empty($orderSnArr)) {
-            return [];
+        $respond = self::getList('orderSn,id', $where, 'id DESC');
+        if (isset($respond['list']) && !empty($respond['list'])) {
+            $orderSnData = array_unique(array_filter(array_column($respond['list'], 'orderSn')));
+            $orderInfoList = OrderClass::getOrderInfoBySnList($orderSnData);
+            foreach ($respond['list'] as $key => $val) {
+                $orderSn = $val['orderSn'] ?? '';
+                $orderInfo = $orderInfoList[$orderSn] ?? [];
+                $respond['list'][$key]['orderInfo'] = $orderInfo;
+            }
         }
-        $respond = OrderClass::getOrderInfoBySnList($orderSnArr);
         return $respond;
     }