Merge branch 'feature/1.9.15-20200310-dingkai'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2721,6 +2721,9 @@ public class OrderSdkAdapter {
             case 208:
                 name = OrderSettlementType.DISCOUNT_COUPON.getName();
                 break;
+            case 1014:
+                name = OrderSettlementType.FULL_DISTRIBUTION_FEE.getName();
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -34,6 +34,7 @@ public enum OldOrderAccountType {
     SET_MEAL(211, "套餐商品优惠", "SET_MEAL"),
     CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额", "CARD_DISCOUNT_AMOUNT"),
     XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"),
+    FULL_DISTRIBUTION_FEE(1014, "满减配送费", "FULL_DISTRIBUTION_FEE"),
     TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
     private Integer code;
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java

@@ -40,8 +40,8 @@ public enum OrderSettlementType {
     DISCOUNT_FEE(205, "优惠总金额"),
     ITEM_SPECIAL_PRICE(206, "单品特价"),
     ONE_BY_ONE(207, "买一送一"),
-    DISCOUNT_COUPON(208, "折扣券")
-
+    DISCOUNT_COUPON(208, "折扣券"),
+    FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
     ;
     private int index;
     private String name;