dilivery

application/models/Business/Order/OrderService.php

@@ -920,14 +920,20 @@ class OrderServiceModel extends \Business\AbstractModel
             $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->getGoodsDetailField()), \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);
             foreach ($qmDeliveryLogList['list'] as &$value) {
-                $delivery = $orderMerge[$value['orderId']];
+                if($value['orderType']==ApiConst::orderTypeRefund){
+                    $delivery=$orderMerge[$refundReturnOrders[$value['orderId']]['orderId']];
+                }else{
+                    $delivery = $orderMerge[$value['orderId']];
+                }
                 $delivery['id'] = $value['id'];
                 $delivery['reciverInfo'] = unserialize($delivery['reciverInfo']);
                 $delivery['mobPhone'] = $delivery['reciverInfo']['mob_phone'];
@@ -1031,11 +1037,11 @@ class OrderServiceModel extends \Business\AbstractModel
         if (empty($this->orderGoodsList)) {
             ErrorModel::throwException(CodeConfigModel::notExistOrderGoods);
         }
-
         //商店相关信息
         $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'],$storeDao->detailField), \Our\ApiConst::oneDaySecond);
-        $orderGoods = $goodsDao->convert($this->orderGoodsList);
-
+        $convertRefundReturn=Array();
+        $convertRefundReturn[$refundReturn['orderGoodsId']]=$refundReturn;
+        $orderGoods = $goodsDao->convert($this->orderGoodsList,false,$convertRefundReturn);
         if (empty($orderGoods)) {
             $orderGoods = array();
         }