From 19679ad7140a75a59da5ed9206a2b388204f3b02 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Tue, 19 Sep 2023 10:47:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E5=8A=B5=E8=BF=87=E6=9C=9F=E6=B5=81=E7=A8=8B=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index ca2018d79..c196dd463 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -526,10 +526,12 @@ public class WxCoupon extends TenantEntity { valid_date = DateUtils.getTimeAfterDays(limit_days, curr); } else if (this.getValidType().equals(EnumCouponValidType.TIME_AND_DAYS.getCode())) { // 时间范围和过期天数共存,最终过期时间以最小的为主 - int limit_days = this.getValidDays(); - valid_date = limit_days != 0 ? DateUtils.getTimeAfterDays(limit_days, curr) : DateUtils.getDayEnd(curr); - if (this.getValidEndDate().before(valid_date)) { + Integer limit_days = this.getValidDays(); + if (limit_days == null) { valid_date = this.getValidEndDate(); + } else { + valid_date = limit_days != 0 ? DateUtils.getTimeAfterDays(limit_days, curr) : DateUtils.getDayEnd(curr); + valid_date = this.getValidEndDate().before(valid_date) ? this.getValidEndDate() : valid_date; } } else { //永久有效