Commit 3762e3c7 by 徐康

保存新的优惠类型 超值加购

parent b20411ef
...@@ -1130,7 +1130,7 @@ public class OrderSdkAdapter { ...@@ -1130,7 +1130,7 @@ public class OrderSdkAdapter {
public Integer getDiscountType(QueryOrderAccountType queryOrderAccountType) { public Integer getDiscountType(QueryOrderAccountType queryOrderAccountType) {
//老订单服务订单优惠类型 2=满减优惠, 5=代金券, 6=商品券, 7=折扣券, 21=限时折扣金额,22=加价购,23=第二件N折,24=买M赠N, //老订单服务订单优惠类型 2=满减优惠, 5=代金券, 6=商品券, 7=折扣券, 21=限时折扣金额,22=加价购,23=第二件N折,24=买M赠N,
//0=其他优惠,1=新用户立减,2=满减,3=抵价券,4=套餐赠送,5=满赠,6=超时赔付,7=部分满减,9=使用红包, //0=其他优惠,1=新用户立减,2=满减,3=抵价券,4=套餐赠送,5=满赠,6=超时赔付,7=部分满减,9=使用红包,
//10=代金券,11=提前下单立减活动,16=满免配送费,20=单品折扣,23=买赠,46=外卖加价购,118=商品券,200=积分, //10=代金券,11=提前下单立减活动,16=满免配送费,20=单品折扣,23=买赠,46=外卖加价购,47=超级加购,118=商品券,200=积分,
//201=折扣,202=现金,203=微信,204=支付宝,205=优惠总金额,206=单品特价,207=买一送一,208=折扣券,215=会员卡优惠; //201=折扣,202=现金,203=微信,204=支付宝,205=优惠总金额,206=单品特价,207=买一送一,208=折扣券,215=会员卡优惠;
// 新订单服务优惠类型枚举 OrderSettlementType // 新订单服务优惠类型枚举 OrderSettlementType
Integer type = 0; Integer type = 0;
...@@ -1155,6 +1155,9 @@ public class OrderSdkAdapter { ...@@ -1155,6 +1155,9 @@ public class OrderSdkAdapter {
case "PREMIUM_EXCHANGE": case "PREMIUM_EXCHANGE":
type = 46; type = 46;
break; break;
case "SUPER_PURCHASE":
type = 47;
break;
case "SECOND_DISCOUNT": case "SECOND_DISCOUNT":
type = 20; type = 20;
break; break;
......
...@@ -27,6 +27,7 @@ public enum OldOrderAccountType { ...@@ -27,6 +27,7 @@ public enum OldOrderAccountType {
PREMIUM_EXCHANGE(22, "加价购", "PREMIUM_EXCHANGE"), PREMIUM_EXCHANGE(22, "加价购", "PREMIUM_EXCHANGE"),
SECOND_DISCOUNT(23, "第二件N折", "SECOND_DISCOUNT"), SECOND_DISCOUNT(23, "第二件N折", "SECOND_DISCOUNT"),
BUYM_SENDN(24, "买M赠N", "BUYM_SENDN"), BUYM_SENDN(24, "买M赠N", "BUYM_SENDN"),
SUPER_PURCHASE(25, "超值加购", "SUPER_PURCHASE"),
CUSTOMER_SCORE(4, "积分兑换", "CUSTOMER_SCORE"), CUSTOMER_SCORE(4, "积分兑换", "CUSTOMER_SCORE"),
WEIXIN(203,"微信优惠","WECHAT_DISCOUNT"), WEIXIN(203,"微信优惠","WECHAT_DISCOUNT"),
ALIPAY(204,"支付宝优惠","ALIPAY_DISCOUNT"), ALIPAY(204,"支付宝优惠","ALIPAY_DISCOUNT"),
......
...@@ -26,6 +26,7 @@ public enum QueryOrderAccountType { ...@@ -26,6 +26,7 @@ public enum QueryOrderAccountType {
DISCOUNT_COUPON("DISCOUNT_COUPON", "折扣券"), DISCOUNT_COUPON("DISCOUNT_COUPON", "折扣券"),
DISCOUNT_AMOUNT("DISCOUNT_AMOUNT", "限时折扣金额"), DISCOUNT_AMOUNT("DISCOUNT_AMOUNT", "限时折扣金额"),
PREMIUM_EXCHANGE("PREMIUM_EXCHANGE", "加价购"), PREMIUM_EXCHANGE("PREMIUM_EXCHANGE", "加价购"),
SUPER_PURCHASE("SUPER_PURCHASE", "超值加购"),
SECOND_DISCOUNT("SECOND_DISCOUNT", "第二件N折"), SECOND_DISCOUNT("SECOND_DISCOUNT", "第二件N折"),
BUYM_SENDN("BUYM_SENDN", "买M赠N"), BUYM_SENDN("BUYM_SENDN", "买M赠N"),
CUSTOMER_SCORE("CUSTOMER_SCORE", "积分兑换"), CUSTOMER_SCORE("CUSTOMER_SCORE", "积分兑换"),
......
...@@ -1997,6 +1997,9 @@ public class OrderAdapter { ...@@ -1997,6 +1997,9 @@ public class OrderAdapter {
if (ActivityTypeEnum.TYPE_320.getCode().equals(activityType)){ if (ActivityTypeEnum.TYPE_320.getCode().equals(activityType)){
return OldOrderAccountType.MEMBER_PRICE_DISCOUNT; return OldOrderAccountType.MEMBER_PRICE_DISCOUNT;
} }
if (ActivityTypeEnum.TYPE_23.getCode().equals(activityType)){
return OldOrderAccountType.SUPER_PURCHASE;
}
return OldOrderAccountType.BUYM_SENDN; return OldOrderAccountType.BUYM_SENDN;
} }
......
...@@ -41,6 +41,7 @@ public enum ActivityTypeEnum { ...@@ -41,6 +41,7 @@ public enum ActivityTypeEnum {
/** /**
* 加价购 * 加价购
*/ */
TYPE_23(23, "超值加购"),
TYPE_81(81, "满额换购"), TYPE_81(81, "满额换购"),
TYPE_82(82, "满额阶梯换购(满多少金额,加价换购)"), TYPE_82(82, "满额阶梯换购(满多少金额,加价换购)"),
TYPE_100(100, "阶梯满数量打折"), TYPE_100(100, "阶梯满数量打折"),
......
...@@ -30,6 +30,7 @@ public enum OrderSettlementType { ...@@ -30,6 +30,7 @@ public enum OrderSettlementType {
ITEM_DISCOUNT(20, "单品折扣"), ITEM_DISCOUNT(20, "单品折扣"),
BUY_GIFT(23,"买赠"), BUY_GIFT(23,"买赠"),
TAKEAWAY_ADD_PRICE(46, "外卖加价购"), TAKEAWAY_ADD_PRICE(46, "外卖加价购"),
SUPER_PURCHASE(47, "超值加购"),
PRODUCT_COUPON(118, "商品券"), PRODUCT_COUPON(118, "商品券"),
POINTS(200, "积分"), POINTS(200, "积分"),
......
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