From 5e25336e3db337a2363b964911d477f320ca67e2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Mar 2022 12:43:20 +0800 Subject: [PATCH] /test --- .../service/impl/WxChartServiceImpl.java | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index b83d29e1c..ea905008e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1072,32 +1072,28 @@ public class WxChartServiceImpl implements WxChartDataService { * @return */ private ResultData getCarNewMemberCountInWeek(TenantEntity tenantEntity) { -// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); HashMap datamap = new HashMap<>(); - HashMap weekParams = new HashMap<>(); -// weekParams.put("tenantEntitys", tenantEntitys); - weekParams.put("tenantId", tenantEntity.getTenantId()); - weekParams.put("finalTenantId", tenantEntity.getFinalTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); - } String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); - weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); - weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); - weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); - List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(weekParams); - Map weekCarCollect = carCountHistory.stream().collect(Collectors.toMap(m -> { - return (String) m.get("create_time"); + + WxChartDataEntity chartData = new WxChartDataEntity(); + chartData.updateTenantInfo(tenantEntity); + chartData.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); + chartData.setStartTime(DateUtils.stringToDate(oneWeekStartdate)); + chartData.setEndTime(DateUtils.stringToDate(oneWeekEndDate)); + List list = wxChartDataMapper.findList(chartData); + Map collect = list.stream().collect(Collectors.toMap(m -> { + return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); }, m -> { - return m.get("count"); + return m.getResult(); })); + List days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0"); List timeList = new ArrayList<>(); List valList = new ArrayList<>(); for (String date : days) { String newdate = date.substring(5, date.length()).replace("-", "/"); - Object o = weekCarCollect.get(newdate); + Object o = collect.get(date); timeList.add(newdate); if (o == null) { valList.add(0L);