Authored by 郝肖肖

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy into release/4.4

... ... @@ -330,6 +330,7 @@ class OrderModel
$result['courierNumbe'] = isset($logistics['data']['express_number']) ? $logistics['data']['express_number'] : '';
$expressDetail = isset($logistics['data']['express_detail']) ? $logistics['data']['express_detail'] : array();
if (isset($expressDetail) && $expressDetail) {
$logisticsTmp = $result['logistics'][0];//暂存
$result['logistics'] = array();
foreach ($expressDetail as $value) {
$pos = stripos($value['accept_address'], ' ') / 3;
... ... @@ -342,6 +343,8 @@ class OrderModel
$result['logistics'][] = $value['acceptTime'] . $city . $exInfo;
}
}
//把最初的处理放最后
$result['logistics'][]=$logisticsTmp;
}
}
}
... ...