From f138a2081dc17cf5ecb210cc85e0d828baea2bdc Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 10 Oct 2019 22:45:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=8A=A5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MarkingDataReportServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 cdd231e61..b4e2b015d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -197,10 +197,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); - params3.put("tenantId", tenantId); - params3.put("startTime", addDay(-30)); - params3.put("endTime", addDay(1)); - params3.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 + params4.put("tenantId", tenantId); + params4.put("startTime", addDay(-30)); + params4.put("endTime", addDay(1)); + params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 List list4 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params4); Map OrderCountMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); From 77aca4f3c182385ddcd582514a988a288547a244 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 10 Oct 2019 22:45:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[pom][=E4=BF=AE=E6=94=B9]:=E6=89=93?= =?UTF-8?q?=E5=8C=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index 3f93cfb95..23ad528c2 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -61,7 +61,6 @@ spring-boot-maven-plugin true -