From 4d58c861c6fbf102177330bc57bc72200144cddb Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 19 Jan 2019 12:43:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81&?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=BD=A6=E8=BE=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/mapper/WxCarCmdLogMapper.java | 1 + .../com/iformall/service/impl/DataTowerServiceImpl.java | 8 +------- .../src/main/resources/mapper/WxCarCmdLogMapper.xml | 6 ++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index eb39141f4..cd560d2c0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -26,4 +26,5 @@ public interface WxCarCmdLogMapper extends CommonMapper { String queryTenantIdBySynId(HashMap params); + Long queryWeekCarPayCount(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index cae19b0b7..e07c35ad9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -519,13 +519,7 @@ public class DataTowerServiceImpl implements DataTowerService { weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); - List> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(weekParams); - Map oneWeekCollect = oneWeekHistorylist.stream().collect(Collectors.toMap(m -> { - return m.get("create_date"); - }, m -> { - return m.get("carcount"); - })); - datamap.put("oneWeekCarPayCount",oneWeekCollect.get("carcount")==null?0:oneWeekCollect.get("carcount")); + datamap.put("oneWeekCarPayCount",wxCarCmdLogMapper.queryWeekCarPayCount(weekParams)); // 近一周缴费金额 weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 4268fd0b7..d76514fa7 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -85,6 +85,12 @@ ) c group by c.create_time order by c.create_time + +