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 9fda9f7b..f0ec9624 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 @@ -56,13 +56,19 @@ public class CouponService { JSONObject jsonObjectResult = JSONObject.parseObject(result); com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObjectResult.getString("data")); com.alibaba.fastjson.JSONArray afterFilterArrary = new JSONArray(); + Date nowDate =SmartDateUtil.parseYMD(SmartDateUtil.formatYMD(new Date())); for(int i = 0;i < jsonArray.size();i ++){ JSONObject jsonResult = (JSONObject)jsonArray.get(i); if(jsonResult.getString("udf2") != null) { + //优惠券有效过期时间 Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString()); - if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1) { + //优惠券有效开始时间 + Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString()); + if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 + && startDate.compareTo(nowDate) != 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 + && startDate.compareTo(nowDate) != 1){ for(int g = 0 ;g