pc

application/models/Business/Order/OrderService.php

@@ -710,25 +710,27 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderIds = array_column($qmDeliveryLogList['list'], 'orderId');
       //  echo json_encode($orderIds);exit;
        // $where['delete_state'] = ApiConst::undeleteOrder;
+
         $orderIds=implode(',',$orderIds);
-        $where =Common::format(" order_id in({0})",$orderIds);
-       // $where['lock_state'] = ApiConst::zero;
 
-        //获得订单列表
-     //  $orders=$orderDao->getList($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc'));
-         $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($diliverymanId));
-        $goodsDao = \DAO\GoodsModel::getInstance();
-        $orderIds = array_column($orders['list'], 'orderId');
-        $orderCommons = $orderCommonDao->getAllByOrderIdsCache($orderIds, $diliverymanId, $orderCommonDao->orderCommonField);
 
         //获得订单商品列表
         if (!empty($orderIds)) {
+            $where =Common::format(" order_id in({0})",$orderIds);
+            // $where['lock_state'] = ApiConst::zero;
+
+            //获得订单列表
+            //  $orders=$orderDao->getList($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc'));
+            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($diliverymanId));
+            $goodsDao = \DAO\GoodsModel::getInstance();
+            $orderIds = array_column($orders['list'], 'orderId');
+            $orderCommons = $orderCommonDao->getAllByOrderIdsCache($orderIds, $diliverymanId, $orderCommonDao->orderCommonField);
             $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderIds, $this->orderGoodsField), \Our\ApiConst::oneDaySecond, array($diliverymanId.'_'));
             $orderMerge = Common::intergrateOneToMany($orders['list'], $orderGoods, 'orderId', 'orderId', 'orderGoods');
             $orderMerge = Common::intergrateOneToOne($orderMerge, $orderCommons, 'orderId', 'orderId');
             $orderMerge = $orderDao->convertOrderList($orderMerge);
             $convertResult = array();
-            $orderGoods = $goodsDao->convert($orderGoods);
+            //$orderGoods = $goodsDao->convert($orderGoods);
             foreach ($qmDeliveryLogList['list'] as &$value) {
                 $delivery = $orderMerge[$value['orderId']];
                 $delivery['id'] = $value['id'];