From 23c9abfe0f764f934a3b65abc29e9f3017f97d5f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 7 Jan 2019 19:51:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BA=91=E7=AB=AF=E6=B5=8B=E8=AF=95=20version?= =?UTF-8?q?:.426.552=EF=BC=9A=E8=90=A5=E9=94=80=E7=BB=9F=E8=AE=A1-?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MarkingDataReportServiceImpl.java | 4 ++-- .../main/resources/mapper/WxCouponOrderMapper.xml | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 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 56070df79..49337c987 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -566,7 +566,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if (markingCouponDataReportDto.getStartTime() != null) params1.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) - params1.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); + params1.put("endTime", markingCouponDataReportDto.getEndTime()); PageHelper.startPage(pageIndex, pageSize); List wxUserVisitList = wxUserVisitMapper.touchUsersReportList(params1); @@ -580,7 +580,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if (markingCouponDataReportDto.getStartTime() != null) params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) - params2.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); + params2.put("endTime", markingCouponDataReportDto.getEndTime()); List couponDatalist = wxCouponOrderMapper.touchUsersReportList(params2); Map visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getxTime, p -> p)); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 80a83e048..5a5e36fa1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -378,8 +378,8 @@ and co.coupon_order_status = #{couponOrderStatus} - - + + and (case when com.mc=1 then (select m.name from wx_merchant m, wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id=co.coupon_id) else '[多商户通用]' end) @@ -393,9 +393,13 @@ AND co.create_date < #{endDate,jdbcType=TIMESTAMP} - + + + and co.id = #{id} + + order by ${sortColumns} - +