Commit e67cb164 by dingkai

满额减配送费

parent 650a7edc
...@@ -2719,6 +2719,9 @@ public class OrderSdkAdapter { ...@@ -2719,6 +2719,9 @@ public class OrderSdkAdapter {
case 208: case 208:
name = OrderSettlementType.DISCOUNT_COUPON.getName(); name = OrderSettlementType.DISCOUNT_COUPON.getName();
break; break;
case 1014:
name = OrderSettlementType.FULL_DISTRIBUTION_FEE.getName();
break;
default: default:
break; break;
} }
......
...@@ -34,6 +34,7 @@ public enum OldOrderAccountType { ...@@ -34,6 +34,7 @@ public enum OldOrderAccountType {
SET_MEAL(211, "套餐商品优惠", "SET_MEAL"), SET_MEAL(211, "套餐商品优惠", "SET_MEAL"),
CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额", "CARD_DISCOUNT_AMOUNT"), CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额", "CARD_DISCOUNT_AMOUNT"),
XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"), XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"),
FULL_DISTRIBUTION_FEE(1014, "满减配送费", "FULL_DISTRIBUTION_FEE"),
TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT"); TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
private Integer code; private Integer code;
......
...@@ -40,8 +40,8 @@ public enum OrderSettlementType { ...@@ -40,8 +40,8 @@ public enum OrderSettlementType {
DISCOUNT_FEE(205, "优惠总金额"), DISCOUNT_FEE(205, "优惠总金额"),
ITEM_SPECIAL_PRICE(206, "单品特价"), ITEM_SPECIAL_PRICE(206, "单品特价"),
ONE_BY_ONE(207, "买一送一"), ONE_BY_ONE(207, "买一送一"),
DISCOUNT_COUPON(208, "折扣券") DISCOUNT_COUPON(208, "折扣券"),
FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
; ;
private int index; private int index;
private String name; private String name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment