Merge branches 'feature/20200420_外卖配送费错误_wuping' and 'master' of…

Merge branches 'feature/20200420_外卖配送费错误_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -1738,6 +1738,9 @@ public class OrderSdkAdapter {
             case 2:
                 newOrderAccountType = OldOrderAccountType.BUY_DISCOUNT.getCode();
                 break;
+            case 3:
+                newOrderAccountType = OldOrderAccountType.PRICE_DEDUCTION_COUPON.getCode();
+                break;
             case 10:
                 newOrderAccountType = OldOrderAccountType.COUPON.getCode();
                 break;

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

@@ -36,6 +36,7 @@ public enum OldOrderAccountType {
     XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"),
     FULL_DISTRIBUTION_FEE(1014, "满减配送费", "FULL_DISTRIBUTION_FEE"),
     NEW_USER_DISCOUNT(101, "新用户立减", "NEW_USER_DISCOUNT"),
+    PRICE_DEDUCTION_COUPON(103, "抵价券", "PRICE_DEDUCTION_COUPON"),
     TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
     private Integer code;