pc

application/models/Business/Order/RefundService.php

@@ -428,20 +428,20 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturns = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array($where, $this->storeRefundReturnField, $pageIndex, $pageSize, $order), \Our\ApiConst::oneDaySecond, array($storeId));
 
         $orderGoodsId = array_column($refundReturns['list'], 'orderGoodsId');
-        $orderIds= array_column($refundReturns['list'], 'orderId');
-        echo json_encode($orderIds);
-        $orderWhere['order_id']=array('in',$orderIds);
+
         //获得售后商品列表getOrderGoodsByRecIds
         if (!empty($orderGoodsId)) {
-            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "order_id as orderId,goods_amount as goodsAmount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", ApiConst::zero, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
 
-            $orders=$orderDao->convertOrder($orders['list'],'orderId');
-            $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
-            $orderCommons=$orderDao->convertOrder($orderCommons,'orderId');
             $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array($orderGoodsId, $this->refundOrderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
 
             $refundMerge = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
+            $orderIds= array_column($refundMerge['list'], 'orderId');
+            $orderWhere['order_id']=array('in',$orderIds);
+            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "order_id as orderId,goods_amount as goodsAmount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", ApiConst::zero, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
 
+            $orders=$orderDao->convertOrder($orders['list'],'orderId');
+            $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
+            $orderCommons=$orderDao->convertOrder($orderCommons,'orderId');
             foreach ($refundMerge as &$value) {
                 $value['stateName'] = $refundReturnDao->getRefundTextStatus($value);
                 /*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero;