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 10823049..7a8110f6 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 @@ -59,11 +59,10 @@ public class CouponService { for(int i = 0;i < jsonArray.size();i ++){ JSONObject jsonResult = (JSONObject)jsonArray.get(i); if(jsonResult.getString("udf2") != null) { - //&&compareDate.compareTo(currentDate)>=0 - Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString()); - if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)==-1) { + Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString()); + if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1) { afterFilterArrary.add(jsonResult); - }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)==-1){ + }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1){ for(int g = 0 ;g