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

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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -69,5 +69,5 @@ public class CancelOrderRequest extends BaseConfig {
      * 是否退配送费
      */
     @Builder.Default
-    private boolean isRefundDeliveryAmount = false;
+    private boolean isRefundDeliveryAmount = true;
 }

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

@@ -1173,16 +1173,6 @@ public class OrderServiceImpl implements Orderservice {
                 //backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.COUPON.getCode(), TransTypeEnum.PRODUCT.getCode()));
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else {
-//                com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
-//                OrderRefundRequestDto orderRefundRequestDto = orderAdapter.convent2OrderRefundRequestDto(orderRefundVo, orderBean.getOid());
-//                BeanUtil.convertBean(orderRefundRequestDto, var1);
-//                var1.setTrackingNo(LogTreadLocal.getTrackingNo());
-//                var1.setPartnerId(orderRefundVo.getPartnerId());
-//                var1.setStoreId(orderBean.getShopId());
-//                var1.setOrderStatus(orderBean.getStatus());
-//                var1.setOperator(orderBean.getUserName());
-//                BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
-
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
                 cancelOrderRequest.setStoreId(orderBean.getShopId());