ccw:master_dev

application/models/Business/Order/RefundService.php

@@ -14,6 +14,7 @@ use Our\ImageConst;
 use Our\ImageUtil;
 use Our\NameConst;
 use Our\OrderConst;
+use Zend\Validator\File\Count;
 
 /**
  * 店铺service
@@ -992,6 +993,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
         $orderGoodses = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderInfo['orderId'], $this->orderGoodsField), \Our\ApiConst::oneDaySecond);
         $orderGoodses = $orderGoodsDao->convertOrderGoods($orderGoodses, 'goodsId');
+        $allOrderGoods=$orderGoodses;
         $goodsIds = $orderGoodsDao->getRefundOrderGoodsIds($orderGoodses);
         $alreadyRefundGoodsIds=$goodsIds;
 //        $this->store=$storeDao->get($this->order['storeId']);
@@ -1006,11 +1008,18 @@ class RefundServiceModel extends \Business\AbstractModel
             ErrorModel::throwException(CodeConfigModel::notExistOrderGoods);
         }
         $shippingFee = ApiConst::zero;
-        if (count($orderGoods) == ApiConst::one) {
-            $shippingFee = $storeDao->isFee($orderInfo['storeId'], $orderInfo['shippingType'], $orderInfo['order_state']) ? $orderInfo['shippingFee'] : ApiConst::zero;
-        } else {
+        $allReadyGoodsCount=count($goodsIds);
+        $allGoodsCount=count($orderGoodses);
+        if($allReadyGoodsCount==$allGoodsCount){
+            $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 {
+//            $shippingFee == ApiConst::zero;
+//        }
         $orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods);
 
         $returnData = array(
@@ -1035,6 +1044,10 @@ class RefundServiceModel extends \Business\AbstractModel
        // }
         //修改后的优惠金额
         $discountAmount=$orderInfo['originAmount']- $orderInfo['orderAmount'];
+        $mustReduceAmount=ApiConst::zero;
+        if($discountAmount){
+            $mustReduceAmount=$orderGoodsDao->getMustReduceAmount($allOrderGoods,$discountAmount,$orderGoodsConvert);
+        }
         if ($orderInfo['paymentTime']) {
             $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
 
@@ -1048,16 +1061,18 @@ class RefundServiceModel extends \Business\AbstractModel
                         $refundAmount = $orderInfo['orderAmount'] - $orderInfo['shippingFee'] - ApiConst::zero;;
                     }
                 }
-                if(!$alreadyRefundGoodsIds){
-                    $refundAmount=$refundAmount-$discountAmount;
-                }
+//                if(!$alreadyRefundGoodsIds){
+//                    $refundAmount=$refundAmount-$discountAmount;
+//                }
+
 
             } else {
                 $refundAmount = $orderGoods['goodsPrice']*$orderGoods['goodsNum'];
-                if(!$alreadyRefundGoodsIds){
-                    $refundAmount=$refundAmount-$discountAmount;
-                }
+//                if(!$alreadyRefundGoodsIds){
+//                    $refundAmount=$refundAmount-$discountAmount;
+//                }
             }
+            $refundAmount=$refundAmount-$mustReduceAmount;
             $liveMoney=$orderInfo['orderAmount']-$orderInfo['refundAmount'];
             if($refundAmount>$liveMoney){
                 $refundAmount=$liveMoney;