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 ea905008e..707566973 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1116,17 +1116,15 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getCarPayCarCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); - HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantEntity.getTenantId()); - 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("cmdTypes", EnumCarCmd.getCarPay()); - datamap.put("oneWeekCarPayCount", wxCarCmdLogService.queryHistoryCount(weekParams)); + WxChartDataEntity ChartDataEntity = new WxChartDataEntity(); + ChartDataEntity.updateTenantInfo(tenantEntity); + ChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); + ChartDataEntity.setStartTime(DateUtils.stringToDate(oneWeekStartdate)); + ChartDataEntity.setStartTime(DateUtils.stringToDate(oneWeekEndDate)); + Long weekCount = wxChartDataMapper.findSumResult(ChartDataEntity); + datamap.put("oneWeekCarPayCount", weekCount); return new ResultData(datamap); }