Commit c9abd336 by 徐康

修复问题

parent b1718f0d
...@@ -1341,6 +1341,9 @@ public class OrderSdkAdapter { ...@@ -1341,6 +1341,9 @@ public class OrderSdkAdapter {
case "PRODUCT_COUPON": case "PRODUCT_COUPON":
type = 118; type = 118;
break; break;
case "SEED_PRODUCT_COUPON":
type = 37;
break;
case "DISCOUNT_COUPON": case "DISCOUNT_COUPON":
type = 208; type = 208;
break; break;
...@@ -1963,6 +1966,9 @@ public class OrderSdkAdapter { ...@@ -1963,6 +1966,9 @@ public class OrderSdkAdapter {
case 118: case 118:
newOrderAccountType = OldOrderAccountType.PRODUCT_COUPON.getCode(); newOrderAccountType = OldOrderAccountType.PRODUCT_COUPON.getCode();
break; break;
case 37:
newOrderAccountType = OldOrderAccountType.SEED_PRODUCT_COUPON.getCode();
break;
case 208: case 208:
newOrderAccountType = OldOrderAccountType.DISCOUNT_COUPON.getCode(); newOrderAccountType = OldOrderAccountType.DISCOUNT_COUPON.getCode();
break; break;
......
...@@ -22,6 +22,7 @@ public enum OldOrderAccountType { ...@@ -22,6 +22,7 @@ public enum OldOrderAccountType {
PACK_AMOUNT(3, "包装费", "PACK_AMOUNT"), PACK_AMOUNT(3, "包装费", "PACK_AMOUNT"),
COUPON(5, "代金券", "COUPON"), COUPON(5, "代金券", "COUPON"),
PRODUCT_COUPON(6, "商品券", "PRODUCT_COUPON"), PRODUCT_COUPON(6, "商品券", "PRODUCT_COUPON"),
SEED_PRODUCT_COUPON(37, "种子券", "SEED_PRODUCT_COUPON"),
DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"), DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"),
DRIVER_FEE(7, "骑手小费", "DRIVER_FEE"), DRIVER_FEE(7, "骑手小费", "DRIVER_FEE"),
WITH_ORDER_BUY_COUPON_FEE(10, "随单买月卡", "WITH_ORDER_BUY_COUPON_FEE"), WITH_ORDER_BUY_COUPON_FEE(10, "随单买月卡", "WITH_ORDER_BUY_COUPON_FEE"),
......
...@@ -24,6 +24,7 @@ public enum QueryOrderAccountType { ...@@ -24,6 +24,7 @@ public enum QueryOrderAccountType {
COUPON("COUPON", "代金券"), COUPON("COUPON", "代金券"),
FREIGHT_COUPON("FREIGHT_COUPON", "运费券"), FREIGHT_COUPON("FREIGHT_COUPON", "运费券"),
PRODUCT_COUPON("PRODUCT_COUPON", "商品券"), PRODUCT_COUPON("PRODUCT_COUPON", "商品券"),
SEED_PRODUCT_COUPON("SEED_PRODUCT_COUPON", "种子券"),
DISCOUNT_COUPON("DISCOUNT_COUPON", "折扣券"), DISCOUNT_COUPON("DISCOUNT_COUPON", "折扣券"),
DISCOUNT_AMOUNT("DISCOUNT_AMOUNT", "限时折扣金额"), DISCOUNT_AMOUNT("DISCOUNT_AMOUNT", "限时折扣金额"),
PREMIUM_EXCHANGE("PREMIUM_EXCHANGE", "加价购"), PREMIUM_EXCHANGE("PREMIUM_EXCHANGE", "加价购"),
......
...@@ -2589,6 +2589,9 @@ public class OrderAdapter { ...@@ -2589,6 +2589,9 @@ public class OrderAdapter {
if (ActivityTypeEnum.TYPE_32.getCode().equals(activityType)) { if (ActivityTypeEnum.TYPE_32.getCode().equals(activityType)) {
return OldOrderAccountType.PRODUCT_COUPON; return OldOrderAccountType.PRODUCT_COUPON;
} }
if (ActivityTypeEnum.TYPE_37.getCode().equals(activityType)) {
return OldOrderAccountType.SEED_PRODUCT_COUPON;
}
if (ActivityTypeEnum.TYPE_34.getCode().equals(activityType)) { if (ActivityTypeEnum.TYPE_34.getCode().equals(activityType)) {
return OldOrderAccountType.FREIGHT_COUPON; return OldOrderAccountType.FREIGHT_COUPON;
} }
......
...@@ -32,6 +32,7 @@ public enum ActivityTypeEnum { ...@@ -32,6 +32,7 @@ public enum ActivityTypeEnum {
TYPE_32(32, "商品券"), TYPE_32(32, "商品券"),
TYPE_34(34, "运费券"), TYPE_34(34, "运费券"),
TYPE_35(35, "买1赠3券"), TYPE_35(35, "买1赠3券"),
TYPE_37(37, "种子券"),
TYPE_5(5, "整单满金额折"), TYPE_5(5, "整单满金额折"),
TYPE_51(51, "每满金额折"), TYPE_51(51, "每满金额折"),
TYPE_52(52, "阶梯满金额折"), TYPE_52(52, "阶梯满金额折"),
......
...@@ -1638,7 +1638,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1638,7 +1638,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
for(QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean : orderBean.getProductList()) { for(QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean : orderBean.getProductList()) {
if(!ProductTypeEnum.getVirtualProductType().contains(productBean.getProductType()) && CollectionUtils.isNotEmpty(productBean.getDiscountList())) { if(!ProductTypeEnum.getVirtualProductType().contains(productBean.getProductType()) && CollectionUtils.isNotEmpty(productBean.getDiscountList())) {
for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) { for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
if(null != discount.getDiscountType() && OldOrderAccountType.PRODUCT_COUPON.getCode().equals(discount.getDiscountType()) if(null != discount.getDiscountType() && OldOrderAccountType.SEED_PRODUCT_COUPON.getCode().equals(discount.getDiscountType())
&& defaultCardCodes.contains(discount.getDiscountId())) { && defaultCardCodes.contains(discount.getDiscountId())) {
UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo(); UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo();
couponUpdateInfo.setProductSeq(productBean.getSequence()); couponUpdateInfo.setProductSeq(productBean.getSequence());
......
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