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

application/models/Business/Goods/GroupSaleService.php

@@ -843,14 +843,14 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                 $storeExpressNum += $tempObj['goodsNum'];
             }
             if(isset($storeGcCouponPriceArray[$oneGoodsCommon['gcId']]['totalPrice'])){
-                $storeGcCouponPriceArray[$oneGoodsCommon['gcId']]['totalPrice'] += $goods['goods_price']*$tempObj['goodsNum'];
+                $storeGcCouponPriceArray[$oneGoodsCommon['gcId']]['totalPrice'] += $tempObj['goodsPrice']*$tempObj['goodsNum'];
             }else{
-                $storeGcCouponPriceArray[$oneGoodsCommon['gcId']]['totalPrice'] = $goods['goods_price']*$tempObj['goodsNum'];
+                $storeGcCouponPriceArray[$oneGoodsCommon['gcId']]['totalPrice'] = $tempObj['goodsPrice']*$tempObj['goodsNum'];
             }
             if(isset($storeGoodsCommonCouponPriceArray[$tempObj['goodsCommonId']]['totalPrice'])){
-                $storeGoodsCommonCouponPriceArray[$tempObj['goodsCommonId']]['totalPrice'] +=$goods['goods_price']*$tempObj['goodsNum'];
+                $storeGoodsCommonCouponPriceArray[$tempObj['goodsCommonId']]['totalPrice'] +=$tempObj['goodsPrice']*$tempObj['goodsNum'];
             }else{
-                $storeGoodsCommonCouponPriceArray[$tempObj['goodsCommonId']]['totalPrice'] =$goods['goods_price']*$tempObj['goodsNum'];
+                $storeGoodsCommonCouponPriceArray[$tempObj['goodsCommonId']]['totalPrice'] =$tempObj['goodsPrice']*$tempObj['goodsNum'];
             }
             $tempObj['gcId']=$goodsCommonStorages[$goods['goods_commonid']]['gcId'];
             $tempObj['gc_id']=$goodsCommonStorages[$goods['goods_commonid']]['gc_id'];

application/models/Business/Order/RefundService.php

@@ -250,6 +250,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods);
         $returnData = array(
             'orderId' => (int)$orderId,
+            'orderSn'=>$orderInfo['orderSn'],
             'needShippingFee' => $orderInfo['needShippingFee'],
             'shippingType' => $orderInfo['shippingType'],
             'shippingFee' => $shippingFee,