下单记录

biz-hd/order/classes/OrderItemClass.php

@@ -29,25 +29,23 @@ class OrderItemClass extends BaseClass
             $order = 'addTime DESC';
             $where = ['orderSn' => ['in', $snList]];
             $ret = OrderClass::getAllByCondition($where, $order,'*');
-            $data['list'] = $ret;
-            $myInfoList = [];
-            if (!empty($data['list'])) {
+            if (!empty($ret)) {
 
                 //获取订单的商品信息
                 $goodsList = OrderGoodsService::getGoodsListByOrderSns($snList);
 
                 //获取订花人的用户信息
-                $orderUserIds = array_column($data['list'], 'customId');
+                $orderUserIds = array_column($ret, 'customId');
                 $orderUserIds = array_unique(array_filter($orderUserIds));
                 $customList = CustomClass::getCustomByIds($orderUserIds);
 
-                $sjIdList = array_column($data['list'], 'sjId');
+                $sjIdList = array_column($ret, 'sjId');
                 $sjIdList = array_filter(array_unique($sjIdList));
                 $merchantList = MerchantService::getByIds($sjIdList, null, 'id');
 
                 $periodData = [0 => '上午', 1 => '下午', 2 => '晚上'];
                 $defaultImg = imgUtil::groupImg('');
-                foreach ($data['list'] as $key => $val) {
+                foreach ($ret as $key => $val) {
                     $id = $val['id'];
                     $customId = $val['customId'];
                     $currentActPrice = $val['actPrice'] ?? 0;
@@ -58,35 +56,24 @@ class OrderItemClass extends BaseClass
                     if (isset($goodsList[$id])) {
                         $goodsInfoList = $goodsList[$id];
                     }
-                    $data['list'][$key]['goodsInfoList'] = $goodsInfoList;
-                    $data['list'][$key]['bookAvatar'] = isset($customList[$customId]['smallAvatarUrl']) ? $customList[$customId]['smallAvatarUrl'] : '';
+                    $ret[$key]['goodsInfoList'] = $goodsInfoList;
+                    $ret[$key]['bookAvatar'] = isset($customList[$customId]['smallAvatarUrl']) ? $customList[$customId]['smallAvatarUrl'] : '';
                     $sjId = $val['sjId'];
-                    $data['list'][$key]['name'] = isset($merchantList[$sjId]['name']) ? $merchantList[$sjId]['name'] : '';
-                    $data['list'][$key]['reachTime'] = OrderClass::getReachTime($val);
+                    $ret[$key]['name'] = isset($merchantList[$sjId]['name']) ? $merchantList[$sjId]['name'] : '';
+                    $ret[$key]['reachTime'] = OrderClass::getReachTime($val);
                     $requireReachTime = '';
                     if ($val['reachDate'] != '0000-00-00') {
                         $reachPeriodId = $val['reachPeriod'];
                         $reachPeriod = isset($periodData[$reachPeriodId]) ? $periodData[$reachPeriodId] : '上午';
                         $requireReachTime = date("m-d", strtotime($val['reachDate'])) . ' ' . $reachPeriod;
                     }
-                    $data['list'][$key]['requireReachTime'] = $requireReachTime;
+                    $ret[$key]['requireReachTime'] = $requireReachTime;
                     $shortCover = $val['cover'] ?? '';
-                    $data['list'][$key]['cover'] = imgUtil::groupImg($shortCover);
-                }
-
-                foreach($data['list'] as $key => $val) {
-                    $orderSn = $val['orderSn'];
-                    $myInfoList[$orderSn] = $val;
+                    $ret[$key]['cover'] = imgUtil::groupImg($shortCover);
                 }
 
             }
-
-            foreach ($respond['list'] as $key => $val) {
-                $orderSn = $val['orderSn'] ?? '';
-                $currentInfo = $myInfoList[$orderSn]??[];
-                $respond['list'][$key]['orderInfo'] = $currentInfo;
-            }
-
+            $respond['list'] = $ret;
         }
         return $respond;
     }