From d1a62cea69365f4c1e3cf40ebe9d94fd8300e6f5 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 17 Jan 2022 20:04:00 +0800 Subject: [PATCH] fix bug --- .../controller/WxCouponOrderController.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 865cc2544..4a9f2df42 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -91,18 +91,19 @@ public class WxCouponOrderController extends BaseController { PageInfo page = wxCouponOrderService.listCUserVoAsPageOptimize(wxCouponOrder, pageNum, pageSize); Date now = new Date(); - page.getList().stream().forEach(co->{ - if (co.getValidStartDate() != null && co.getValidEndDate() != null ) { - if (co.getValidStartDate().getTime() > now.getTime()) { - co.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); - } else if (co.getValidEndDate().getTime() < now.getTime()) { - co.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); - } else { - co.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); - } - } - }); - + if (null != page.getList()) { + page.getList().stream().forEach(co->{ + if (co.getValidStartDate() != null && co.getValidEndDate() != null ) { + if (co.getValidStartDate().getTime() > now.getTime()) { + co.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); + } else if (co.getValidEndDate().getTime() < now.getTime()) { + co.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); + } else { + co.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); + } + } + }); + } return new ResultData(page); }