From f17784ec710f55a589e69ab91e143ef7d166564e Mon Sep 17 00:00:00 2001 From: "602090531@qq.com" Date: Thu, 17 Mar 2022 16:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=88=B0=E7=94=9F?= =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E4=BC=98=E6=83=A0=E5=88=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smartadmin/module/system/royalcanin/CouponService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java index 38199cdc..d90507c0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -64,8 +64,7 @@ public class CouponService { Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString()); //优惠券有效开始时间 Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString()); - if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 - && startDate.compareTo(nowDate) != 1) { + if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) { afterFilterArrary.add(jsonResult); }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 && startDate.compareTo(nowDate) != 1){