From afdabbf8427319ed47a3a9280b703ca3e59985bf Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 28 Jan 2021 15:48:35 +0800 Subject: [PATCH] sql --- .../service/impl/WxActivityServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 3d3815036..7fd577167 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -275,11 +275,15 @@ public class WxActivityServiceImpl implements WxActivityService { Calendar dd = Calendar.getInstance(); dd.setTime(start); while (start.getTime() <= end.getTime()) { - Map map = new HashMap<>(); - map.put("yyyy", DateUtils.getYear(start)); - map.put("mm", DateUtils.getMonth(start)); - map.put("dd", DateUtils.getMonthOfDate(start)); - list.add(map); + if(start.getTime() >= wxActivity.getStartDate().getTime() + && start.getTime() <= wxActivity.getEndDate().getTime()){ + Map map = new HashMap<>(); + map.put("yyyy", DateUtils.getYear(start)); + map.put("mm", DateUtils.getMonth(start)); + map.put("dd", DateUtils.getMonthOfDate(start)); + list.add(map); + } + // 天数加上1 dd.add(Calendar.DAY_OF_MONTH, 1); start = dd.getTime();