|
|
@@ -449,7 +449,7 @@ public class CpsPopularizeController {
|
|
|
if (CollUtil.isEmpty(show_coupon_ids)) {
|
|
|
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());
|
|
|
+ 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, CouponView::getValidStartTime, CouponView::getValidEndTime).build());
|
|
|
DateTime now = DateTime.now();
|
|
|
couponViews = couponViews.stream().filter(c -> {
|
|
|
if (c.getValidStartTime() != null) {
|
|
|
@@ -460,6 +460,8 @@ public class CpsPopularizeController {
|
|
|
}
|
|
|
return false;
|
|
|
}
|
|
|
+ c.setValidStartTime(null);
|
|
|
+ c.setValidEndTime(null);
|
|
|
return true;
|
|
|
}).collect(Collectors.toList());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(couponViews);
|