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

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

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

@@ -1144,14 +1144,6 @@ public class OrderServiceImpl implements Orderservice {
                 // 删除订单 通知活动添加商品库存
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else {
-                List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = cacheOpenPlatformPartnerWxappConfigManager.cacheSelectDefaultPage(userInfo.getWxAppId(), "2");
-
-                Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
-
-                AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
-                LogUtil.info("refundDeliveryFeeConfig:{}, {}, {}", refundDeliveryFeeConfig.getAppValue(),orderBean.getStatus() ,LogTreadLocal.getTrackingNo());
-                // 0、null表示 关闭 ; 1 表示开启
-
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
                 cancelOrderRequest.setStoreId(orderBean.getShopId());
@@ -1168,12 +1160,7 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-                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()))) {
-                    cancelOrderRequest.setRefundDeliveryAmount(false);
-                }
-
+                cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {