diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 7f5485c41..2dd5daa28 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -96,7 +96,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_LIPIN.getCode(), EnumCouponType.COUPON_TINGCHE.getCode(), EnumCouponType.COUPON_MULTIMCH.getCode(), - EnumCouponType.COUPON_PRESS.getCode()}; + EnumCouponType.COUPON_PRESS.getCode(), + EnumCouponType.COUPON_PREORDER.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 786ab95ea..7a76ad2f0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -93,7 +93,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_LIPIN.getCode(), EnumCouponType.COUPON_TINGCHE.getCode(), EnumCouponType.COUPON_MULTIMCH.getCode(), - EnumCouponType.COUPON_PRESS.getCode()}; + EnumCouponType.COUPON_PRESS.getCode(), + EnumCouponType.COUPON_PREORDER.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 3be7dad59..5bf051b72 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -416,7 +416,8 @@ public class PosServiceImpl implements PosService { if (!(couponType.getCode().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_LIPIN.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_PRESS.getCode()) || - couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode())) + couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()) || + couponType.getCode().equals(EnumCouponType.COUPON_PREORDER.getCode())) ) { logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage()); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); @@ -454,7 +455,8 @@ public class PosServiceImpl implements PosService { if (!(couponType.getCode().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_LIPIN.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_PRESS.getCode()) || - couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode())) + couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()) || + couponType.getCode().equals(EnumCouponType.COUPON_PREORDER.getCode())) ) { logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage()); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT);