pc

application/models/Business/Order/RefundService.php

@@ -401,7 +401,9 @@ class RefundServiceModel extends \Business\AbstractModel
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
+        $orderDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao=\DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
+        $addressDao = \DAO\Order\DAddressModel::getInstance(DbNameConst::salveDBConnectName);
         $where['store_id'] = $storeId;
         $where['order_lock'] = 2;
         $order = array('add_time' => 'desc');
@@ -422,17 +424,43 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderGoodsId = array_column($refundReturns['list'], 'orderGoodsId');
         //获得售后商品列表getOrderGoodsByRecIds
         if (!empty($orderGoodsId)) {
+            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, "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)));
             $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');
+            $refundMerge = Common::intergrateOneToOne($refundMerge, $orders, 'orderId', '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['orderAmount'] = $value['orderAmount'];
+                $value['reciverInfo'] = unserialize($value['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']);
                 $goodGroup=unserialize($value['goodsGroup']);
                 $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
+
+                if ($value['refundType'] == ApiConst::refundTypeGoods) {
+                    if ($value['addressId']) {
+                        $address = $addressDao->getAddressByAddressId($value['addressId'], $this->daddressField);
+                    } else {
+                        $address = $addressDao->getAddressByStoreId($value['storeId'], $this->daddressField);
+                    }
+                    if(!empty($address)){
+                        $address['isDefault'] = (int)$address['isDefault'];
+                        $address['company']=isset( $address['company'])? $address['company']:'';
+                        $value['dAddressInfo'] = $address;
+                    }else{
+                        $value['dAddressInfo'] =new \stdClass();
+                    }
+
+                } else {
+                    $value['dAddressInfo'] = new \stdClass();
+                }
                 unset($value['goodsSpec']);
                // unset($value['picInfo']);
             }