Commit 94e2a0da authored by christ's avatar christ

refundAmount

parent d0125c61
...@@ -966,6 +966,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -966,6 +966,7 @@ class RefundServiceModel extends \Business\AbstractModel
$shippingFee == ApiConst::zero; $shippingFee == ApiConst::zero;
} }
$orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods); $orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods);
$returnData = array( $returnData = array(
'orderId' => (int)$orderId, 'orderId' => (int)$orderId,
'orderSn'=>$orderInfo['orderSn'], 'orderSn'=>$orderInfo['orderSn'],
...@@ -983,7 +984,9 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -983,7 +984,9 @@ class RefundServiceModel extends \Business\AbstractModel
); );
$refundCondition = $orderInfo['refundCondition'] ? unserialize($orderInfo['refundCondition']) : array(); $refundCondition = $orderInfo['refundCondition'] ? unserialize($orderInfo['refundCondition']) : array();
$returnData['needShippingFee'] = $orderInfo['needShippingFee']; $returnData['needShippingFee'] = $orderInfo['needShippingFee'];
if($orderInfo['shippingType']==ApiConst::bySelf){
$returnData['needShippingFee']=ApiConst::zero;
}
if ($orderInfo['paymentTime']) { if ($orderInfo['paymentTime']) {
$orderConfirmUtil = \Order\OrderConfirmUtil::getInstance(); $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment