ccw:master_dev

application/models/Business/Order/RefundService.php

@@ -1056,9 +1056,9 @@ class RefundServiceModel extends \Business\AbstractModel
                     $refundCondition['storeCarts']['storeCarts'] = $cartDao->refundGoodsRemove($refundCondition['storeCarts']['storeCarts'], $goodsIds);
                     if (!empty($refundCondition['storeCarts']['storeCarts'])) {
                         $newTotalPrice = $orderConfirmUtil->reCalcOrderAmount($refundCondition['coupon'], $refundCondition['storeCarts']['storeCarts']);
-                        $refundAmount = $orderInfo['orderAmount'] - $orderInfo['shippingFee'] - $newTotalPrice;
+                        $refundAmount = $orderInfo['orderAmount'] - $newTotalPrice;
                     } else {
-                        $refundAmount = $orderInfo['orderAmount'] - $orderInfo['shippingFee'] - ApiConst::zero;;
+                        $refundAmount = $orderInfo['orderAmount']  - ApiConst::zero;;
                     }
                 }
 //                if(!$alreadyRefundGoodsIds){
@@ -1073,15 +1073,21 @@ class RefundServiceModel extends \Business\AbstractModel
 //                }
             }
             $refundAmount=$refundAmount-$mustReduceAmount;
+            if($orderInfo['shippingType']==ApiConst::bySeller){
+                if(!$shippingFee){
+                    $refundAmount=$refundAmount+$orderInfo['shippingFee'];
+                }
+            }
             $liveMoney=$orderInfo['orderAmount']-$orderInfo['refundAmount'];
             if($refundAmount>$liveMoney){
                 $refundAmount=$liveMoney;
             }
            // $returnData['refundAmount'] = $refundAmount - $orderInfo['refundAmount'] - $returnData['needShippingFee'] + $shippingFee;
-            $returnData['refundAmount'] = $refundAmount - $returnData['needShippingFee'] + $shippingFee;
+            $returnData['refundAmount'] = $refundAmount - $returnData['needShippingFee'];
             if((int)$returnData['refundAmount'] <ApiConst::zero){
                 $returnData['refundAmount']=ApiConst::zero;
             }
+
 //             if($orderGoods['goodsType']==ApiConst::goodsTypeFour){
 //                 //已经退款过的金额
 //                 $alreadyRefundMoney=$orderGoodsDao->getIsRefundMoney($orderGoodses,$orderGoods['promotionsId']);

application/models/DAO/Store.php

@@ -208,7 +208,8 @@ class StoreModel extends \DAO\AbstractModel
     public function isChargeGet($storeId)
     {
         $isChargeGet = $this->getInfoById($storeId, 'is_charge_get');
-        return $isChargeGet > ApiConst::zero ? TRUE : FALSE;
+
+        return $isChargeGet['is_charge_get'] > ApiConst::zero ? TRUE : FALSE;
     }
 
     //线上支付订单已接单待发货退款是否收取服务费(0:否 1:是)