Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/Store/DeliveryService.php

@@ -76,7 +76,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $qmDeliveryManLogData['distribution_fee'] =$data['distributionFee'];
         $qmDeliveryManLogData['order_type'] = $data['orderType'];
         if($data['orderType']==ApiConst::orderTypeRefund){
-            $qmDeliveryManLogData['shipping_fee']=$orderD['need_shipping_fee'];
+            $qmDeliveryManLogData['shipping_fee']=$orderD['needShippingFee'];
         }else{
             $qmDeliveryManLogData['shipping_fee'] =    $orderD['shippingFee'];
         }