Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/readme.md

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

@@ -217,10 +217,10 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private MallOrderServiceImpl mallOrderService;
     @Autowired
+    private CacheOpenPlatformPartnerWxappConfigManager cacheOpenPlatformPartnerWxappConfigManager;
+    @Autowired
     private OrderAdapterService orderAdapterService;
 
-    @Autowired
-    private CacheOpenPlatformPartnerWxappConfigManager cacheOpenPlatformPartnerWxappConfigManager;
 
 
     @Override
@@ -1130,7 +1130,18 @@ 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()));
 
+                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 = false;
+                }
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
                 cancelOrderRequest.setStoreId(orderBean.getShopId());
@@ -1147,6 +1158,7 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+                cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {