fix

netflix-dao/src/main/java/com/cyksj/model/views/CouponDistributePopularizeDetailView.java

@@ -2,7 +2,6 @@ package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -52,10 +51,8 @@ public class CouponDistributePopularizeDetailView {
 	private String exCode;
 
 	@DbField("c.valid_start_time")
-	@JsonIgnore
 	private Date validStartTime;
 
 	@DbField("c.valid_end_time")
-	@JsonIgnore
 	private Date validEndTime;
 }

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsPopularizeController.java

@@ -1,6 +1,7 @@
 package com.cyksj.web.controller.cps;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
@@ -35,8 +36,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /*
  *项目名: netflix
@@ -447,6 +450,18 @@ public class CpsPopularizeController {
 			return GatewayResponse.SUCCESS.newBuilder().toResult();
 		}
 		List<CouponView> couponViews = beanSearcher.searchAll(CouponView.class, MapUtils.flatBuilder(request.getParameterMap()).field(CouponView::getCouponId, show_coupon_ids).op(Operator.InList).onlySelect(CouponView::getCouponId, CouponView::getName).build());
+		DateTime now = DateTime.now();
+		couponViews = couponViews.stream().filter(c -> {
+			if (c.getValidStartTime() != null) {
+				Date validStartTime = c.getValidStartTime();
+				Date validEndTime = c.getValidEndTime();
+				if (validStartTime.compareTo(now) <= 0 && validEndTime.compareTo(now) >= 0) {
+					return true;
+				}
+				return false;
+			}
+			return true;
+		}).collect(Collectors.toList());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(couponViews);
 	}
 }