Commit 5d2ea707 authored by wwccw0591's avatar wwccw0591

pc

parent e1b2f370
...@@ -432,7 +432,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -432,7 +432,7 @@ class RefundServiceModel extends \Business\AbstractModel
$orderWhere['order_id']=array('in',$orderIds); $orderWhere['order_id']=array('in',$orderIds);
//获得售后商品列表getOrderGoodsByRecIds //获得售后商品列表getOrderGoodsByRecIds
if (!empty($orderGoodsId)) { if (!empty($orderGoodsId)) {
$orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "goods_amount as goods_amount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId))); $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "goods_amount as goodsAmount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
$orders=$orderDao->convertOrder($orders,'orderId'); $orders=$orderDao->convertOrder($orders,'orderId');
$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField); $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
...@@ -455,7 +455,8 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -455,7 +455,8 @@ class RefundServiceModel extends \Business\AbstractModel
$value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize); $value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize);
$value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']); $value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']);
$value=$orderDao->getClienOrderCommon($orders[$value['orderId']]); $extent=$orderDao->getClienOrderCommon($orders[$value['orderId']]);
$value=array_merge($value,$extent);
$goodGroup=unserialize($value['goodsGroup']); $goodGroup=unserialize($value['goodsGroup']);
$value['goodsGroup']=!empty($goodGroup)?$goodGroup:[]; $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
if ($value['refundType'] == ApiConst::refundTypeGoods) { if ($value['refundType'] == ApiConst::refundTypeGoods) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment