退单增加 是否退运费配置

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

@@ -1173,14 +1173,13 @@ public class OrderServiceImpl implements Orderservice {
 
                 Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
 
-                boolean isRefundDeliveryFee = false;
+                boolean isRefundDeliveryFee = true;
                 AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
                 log.info("refundAgree.refundShippingFee of oid:{}, {}", orderBean.getOid(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
                 // 0、null表示 关闭 ; 1 表示开启
                 if (null != refundDeliveryFeeConfig
-                        && ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())
-                        && !PayChannel.SVC.getCode().equals(orderBean.getPayChannel())) {
-                    isRefundDeliveryFee = true;
+                        && (!ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())||PayChannel.SVC.getCode().equals(orderBean.getPayChannel()))) {
+                    isRefundDeliveryFee = false;
                 }
 
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();