oss

application/models/Business/Order/OrderService.php

@@ -231,7 +231,6 @@ class OrderServiceModel extends \Business\AbstractModel
      */
     public function getOrderDetail($orderId)
     {
-       error_reporting(E_ALL);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);

application/models/Business/Store/ShopkeeperService.php

@@ -309,7 +309,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 $qmDeliveryManLogWhere['order_type']= ApiConst::orderTypeBuy;
                 $qmDeliveryManLogs=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array($qmDeliveryManLogWhere, $qmDeliveryManLogDao->fieldDetail,ApiConst::zero,$pageSize), \Our\ApiConst::oneDaySecond, array($storeId));
                 //$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
-                $ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs, 'orderId', 'orderId');
+                $ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs['list'], 'orderId', 'orderId');
                 $ordersOrderCommons=Common::intergrateOneToOne($ordersOrderCommons, $orderCommons, 'orderId', 'orderId');
                 $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods');
                 foreach ($orderMerge as &$value) {
@@ -492,6 +492,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $diliverymanDao = \DAO\Order\DiliverymanModel::getInstance(DbNameConst::salveDBConnectName);
         $storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
+        $qmDeliveryManDao=\DAO\Order\QmDeliverymanLogModel::getInstance();
         //订单
         $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond, array($orderId));
         if ($order['store_id'] != $storeId) {