refund

application/models/Business/Order/RefundService.php

@@ -992,9 +992,9 @@ class RefundServiceModel extends \Business\AbstractModel
         );
         $refundCondition = $orderInfo['refundCondition'] ? unserialize($orderInfo['refundCondition']) : array();
         $returnData['needShippingFee'] = $orderInfo['needShippingFee'];
-        if($orderInfo['shippingType']==ApiConst::bySelf){
+       // if($orderInfo['shippingType']==ApiConst::bySelf){
             $returnData['needShippingFee']=ApiConst::zero;
-        }
+       // }
         if ($orderInfo['paymentTime']) {
             $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
 
@@ -1071,6 +1071,9 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $orderInfo = $orderDao->findByMemberIdAndOrderId($memberId, $refund['orderId'], $this->orderField);
         $storeDao=\DAO\StoreModel::getInstance();
+        if($refund['refundType']==ApiConst::refundTypeGoods){
+            $refund['refundAmount']-=$orderInfo['needShippingFee'];
+        }
         $whereRefund['goods_id']=$refund['goodsId'];
         $whereRefund['buyer_id']=$memberId;
         $whereRefund['order_id']=$orderInfo['orderId'];