diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 58256a9db..d8f3d3a75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -452,7 +452,7 @@ public class WxOrderServiceImpl implements WxOrderService { /** * 用户正在参加的新手活动 * - * @param user + * @param * @return */ public int countCouponConditionType1(String subTenantId,Long cuserId) { @@ -1016,7 +1016,12 @@ public class WxOrderServiceImpl implements WxOrderService { if (coupon.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode()) || coupon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) { - valid_date = coupon.getValidEndDate(); + + if( coupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){ + valid_date = coupon.getPickEndDate(); + }else{ + valid_date = coupon.getValidEndDate(); + } if (coupon.getSalePrice() > 0 && !coupon.checkIsCard()) { if (payOrder != null && payOrder.getShareAmount() != null) { // 分账有价券核销有效期不能大于分账过期时间 @@ -1163,7 +1168,11 @@ public class WxOrderServiceImpl implements WxOrderService { Date valid_date = null; int limit_days = Constant.WX_LIMIT_DAYS; if (coupon.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode())) { - valid_date = coupon.getValidEndDate(); + if( coupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){ + valid_date = coupon.getPickEndDate(); + }else{ + valid_date = coupon.getValidEndDate(); + } } else { limit_days = coupon.getValidDays(); valid_date = DateUtils.getTimeAfterDays(limit_days, curr);