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/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.6.7-SNAPSHOT</version>
+    <version>1.6.8-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -57,4 +57,5 @@
 | 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
 | 1.6.5-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
 | 1.6.6-SNAPSHOT | 退单增加配送费字段 | 海波 | 2020-05-12 |
-| 1.6.7-SNAPSHOT | 开放平台订单详情补全信息 | 茹祥 | 2020-05-12 |
+| 1.6.7-SNAPSHOT | 开放平台订单详情补全信息 | 茹祥 | 2020-05-12 |
\ No newline at end of file
+| 1.6.8-SNAPSHOT | 退配送费增加默认值 | 海波 | 2020-05-12 |
\ No newline at end of file

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

@@ -1144,7 +1144,6 @@ public class OrderServiceImpl implements Orderservice {
                 // 删除订单 通知活动添加商品库存
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else {
-
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
                 cancelOrderRequest.setStoreId(orderBean.getShopId());