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 d90507c0..4bc3ae32 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 @@ -7,6 +7,7 @@ import net.lab1024.smartadmin.module.system.royalcanin.coupon.*; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartDateUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; +import net.lab1024.smartadmin.util.SmartStringUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -64,10 +65,10 @@ 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)) { + if ("H5".equals(jsonResult.getString("udf2"))&& SmartStringUtil.isBlank(couponGetAllEntity.getProductCodes())) { afterFilterArrary.add(jsonResult); - }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 - && startDate.compareTo(nowDate) != 1){ + }else if ("H5".equals(jsonResult.getString("udf2"))&& SmartStringUtil.isNotBlank(couponGetAllEntity.getProductCodes()) &&compareDate.compareTo(currentDate)!=-1 + && startDate.compareTo(nowDate) != 1 && compareDate.compareTo(nowDate) != -1){ for(int g = 0 ;g