From 858dd0cf71ef0381cbc5aa8c7b62885b7011b547 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 8 Oct 2018 18:48:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=90=A5=E9=94=80=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A7=A6=E8=BE=BE=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E4=B8=BA?= =?UTF-8?q?30=E5=A4=A9=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MarkingDataReportServiceImpl.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 19095d8f3..b8026eae2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -402,7 +402,30 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); - return wxUserVisitList; + String startdate = DateUtils.getTimeBefore(30, new Date()); + String enddate = DateUtils.getTimeBefore(1,new Date()); + List tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); + List tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); + List tempDatalist =new LinkedList<>(); + + for(String tj:tjList){ + Optional first = wxUserVisitList.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); + if(!first.isPresent()){ + TouchUsersReportVo touchUsersReportVo = new TouchUsersReportVo(); + touchUsersReportVo.setPv(0); + touchUsersReportVo.setUv(0); + touchUsersReportVo.setCouponCount(0); + touchUsersReportVo.setUserCount(0); + touchUsersReportVo.setVerifyCount(0); + touchUsersReportVo.setVerifyUserCount(0); + touchUsersReportVo.setxTime(tj); + tempDatalist.add(touchUsersReportVo); + continue; + } + tempDatalist.add(first.get()); + } + + return tempDatalist; }