Merge remote-tracking branch 'remotes/origin/feature-2020/5/12-1.9.22-退单增加配送费选项-海波' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1139,6 +1139,7 @@ public class OrderServiceImpl implements Orderservice {
                 log.info("refundAgree.refundShippingFee of oid:{}, {}", orderBean.getOid(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
                 // 0、null表示 关闭 ; 1 表示开启
                 if (null != refundDeliveryFeeConfig
+                        && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
                         && (!ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())||PayChannel.SVC.getCode().equals(orderBean.getPayChannel()))) {
                     isRefundDeliveryFee = false;
                 }