Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/Order/RefundService.php

@@ -428,32 +428,35 @@ 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');
-        $orderWhere['order_id']=array('in',$orderIds);
+
         //获得售后商品列表getOrderGoodsByRecIds
         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)));
-
-            $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
 
             $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array($orderGoodsId, $this->refundOrderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
 
-            $refundGoods = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
-            $refundMerge = Common::intergrateOneToOne($refundGoods, $orders, 'orderId', 'orderId');
-            $refundMerge =Common::intergrateOneToOne($refundMerge,$orderCommons,'orderId','orderId');
+            $refundMerge = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
+            $orderIds= array_column($refundMerge, '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;
                 $value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
                 $value['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($value) ? ApiConst::one : ApiConst::zero;*/
-                $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
-                $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
+//                $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
+//                $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
                 // $value['orderAmount'] = $value['orderAmount'];
-                $value['reciverInfo'] = unserialize($value['reciverInfo']);
+                $value['reciverInfo'] = unserialize($orderCommons['reciverInfo']);
                 $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
                 $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
                 $value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize);
                 $value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']);
+               $extent=$orderDao->getClienOrderCommon($orders[$value['orderId']]);
+                $value=array_merge($value,$extent);
                 $goodGroup=unserialize($value['goodsGroup']);
                 $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
                 if ($value['refundType'] == ApiConst::refundTypeGoods) {
@@ -463,6 +466,10 @@ class RefundServiceModel extends \Business\AbstractModel
                 } else {
                     $value['reciverInfo'] = new \stdClass();
                 }
+                $value['picInfo']=unserialize($value['picInfo']);
+                if(!empty($value['picInfo'])){
+                    $value['picInfo'] = $refundReturnDao->getRefundPics($value['picInfo']['buyer']);
+                }
                 unset($value['goodsSpec']);
                // unset($value['picInfo']);
             }
@@ -891,6 +898,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturn['platformStateName'] = ArrayConst::platformState[$refundReturn['platformState']];
         $refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name'];
         $refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn);
+        $refundReturn['stateName']=$refundReturn['refundText'];
         $refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize);
         //$addressDao = \DAO\Order\DAddressModel::getInstance();
         $info = $refundReturn;

application/models/DAO/Order/Order.php

@@ -999,6 +999,16 @@ class OrderModel extends \DAO\AbstractModel
         return $convertResult;
     }
 
+
+    public function convertOrder($orders, $field)
+    {
+        $convertResult = array();
+        foreach ($orders as $key => $value) {
+            $convertResult[$value[$field]] = $value;
+        }
+        return $convertResult;
+    }
+
     public function getFields()
     {
         return array(