快递免邮问题

application/library/Order/OrderConfirmUtil.php

@@ -220,7 +220,7 @@ class OrderConfirmUtil {
                 if($temp['expressDistribution']!=\Our\ApiConst::one){
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::noExpressDeliveryForOrder);
                 }
-                if(!($tempStore['goodsFreight']==\Our\ApiConst::zero&&$tempStore['is_transport']&&$tempStore['transport_id']>\Our\ApiConst::zero&&isset($temp['shippingFee']))){
+                if($tempStore['goodsFreight']==\Our\ApiConst::zero&&!($tempStore['is_transport']&&$tempStore['transport_id']>\Our\ApiConst::zero&&isset($temp['shippingFee']))){
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::noExpressDeliveryForOrder);
                 }
                 $deliveryFee = $temp['shippingFee'];

application/models/Error/CodeConfig.php

@@ -694,7 +694,7 @@ const notAllowDelete=300114;
             self::wrongDeliveryTimeRangeForOrder => '下单时配送时间格式',
             self::noBuyerDeliveryTypeForOrder => '该店铺配置到店自提',
             self::noDeliveryFeeForBuyerType => '到店自提不收取配送费',
-            self::noExpressDeliveryForOrder => '该店铺为配置快递配送',
+            self::noExpressDeliveryForOrder => '该店铺未配置快递配送',
             self::wrongPaywayForStoreForOrder => '店铺暂未配置您选择的支付方式',
             self::emptyDeliveryFeeForOrder => '下单时配送费不能为空',
             self::saveOrderPayFailed => '订单支付信息保存失败',