refund

application/models/Business/Order/RefundService.php

@@ -1010,12 +1010,12 @@ class RefundServiceModel extends \Business\AbstractModel
         $shippingFee = ApiConst::zero;
         $allReadyGoodsCount=count($goodsIds);
         $allGoodsCount=count($orderGoodses);
-        $shippingFee = $storeDao->isFee($orderInfo['storeId'], $orderInfo['shippingType'], $orderInfo['orderState']) ? $orderInfo['shippingFee'] : ApiConst::zero;
-//        if($allReadyGoodsCount==$allGoodsCount){
-//            $shippingFee = $storeDao->isFee($orderInfo['storeId'], $orderInfo['shippingType'], $orderInfo['orderState']) ? $orderInfo['shippingFee'] : ApiConst::zero;
-//        }else{
-//            $shippingFee == ApiConst::zero;
-//        }
+       // $shippingFee = $storeDao->isFee($orderInfo['storeId'], $orderInfo['shippingType'], $orderInfo['orderState']) ? $orderInfo['shippingFee'] : ApiConst::zero;
+        if($allReadyGoodsCount==ApiConst::one){
+            $shippingFee = $storeDao->isFee($orderInfo['storeId'], $orderInfo['shippingType'], $orderInfo['orderState']) ? $orderInfo['shippingFee'] : ApiConst::zero;
+        }else{
+            $shippingFee == ApiConst::zero;
+        }
 //        if (count($orderGoods) == ApiConst::one) {
 //            $shippingFee = $storeDao->isFee($orderInfo['storeId'], $orderInfo['shippingType'], $orderInfo['orderState']) ? $orderInfo['shippingFee'] : ApiConst::zero;
 //        } else {
@@ -1040,9 +1040,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();
@@ -1068,7 +1068,12 @@ class RefundServiceModel extends \Business\AbstractModel
 //                    $refundAmount=$refundAmount-$discountAmount;
 //                }
             }
-            $refundAmount=$refundAmount+$orderInfo['shippingFee'];
+            if($allReadyGoodsCount==ApiConst::one){
+                $refundAmount=$refundAmount+$orderInfo['shippingFee'];
+                if($shippingFee &&  ($orderInfo['shippingType']==ApiConst::bySeller)){
+                    $refundAmount=$refundAmount-$orderInfo['shippingFee'];
+                }
+            }
             //修改后的优惠金额按比例退回
             $discountAmount=$orderInfo['originAmount']- $orderInfo['orderAmount'];
             $mustReduceAmount=ApiConst::zero;
@@ -1077,13 +1082,13 @@ class RefundServiceModel extends \Business\AbstractModel
             }
             $refundAmount=$refundAmount-$mustReduceAmount;
             //配送订单配送费按比例收取
-            if($orderInfo['shippingType']==ApiConst::bySeller){
-                $mustSheepingFee=ApiConst::zero;
-                if($discountAmount){
-                    $mustSheepingFee=$orderGoodsDao->getMustReduceAmount($allOrderGoods,$orderInfo['shippingFee'],$orderGoodsConvert);
-                }
-                $refundAmount=$refundAmount-$mustSheepingFee;
-            }
+//            if($orderInfo['shippingType']==ApiConst::bySeller){
+//                $mustSheepingFee=ApiConst::zero;
+//                if($discountAmount){
+//                    $mustSheepingFee=$orderGoodsDao->getMustReduceAmount($allOrderGoods,$orderInfo['shippingFee'],$orderGoodsConvert);
+//                }
+//                $refundAmount=$refundAmount-$mustSheepingFee;
+//            }
             $liveMoney=$orderInfo['orderAmount']-$orderInfo['refundAmount'];
             if($refundAmount>$liveMoney){
                 $refundAmount=$liveMoney;