From cb3cd2813b4e1f6d25c70297b655183c47798f3e Mon Sep 17 00:00:00 2001 From: masterspirit Date: Tue, 11 Sep 2018 17:59:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=B8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/MarkingCouponDataReportDto.java | 9 +++++++++ .../service/impl/MarkingDataReportServiceImpl.java | 4 ++++ .../main/resources/mapper/WxCouponOrderMapper.xml | 14 ++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/simple/domain/dto/MarkingCouponDataReportDto.java index 86c5aa8a3..4f2fb9ef9 100644 --- a/mallinkService/src/main/java/com/simple/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/simple/domain/dto/MarkingCouponDataReportDto.java @@ -10,6 +10,7 @@ public class MarkingCouponDataReportDto { private Date startTime; private Date endTime; private Integer type; + private Integer couponType; public Integer getType() { return type; @@ -34,4 +35,12 @@ public class MarkingCouponDataReportDto { public void setEndTime(Date endTime) { this.endTime = endTime; } + + public Integer getCouponType() { + return couponType; + } + + public void setCouponType(Integer couponType) { + this.couponType = couponType; + } } diff --git a/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java index ef10a7758..07659fa57 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MarkingDataReportServiceImpl.java @@ -195,6 +195,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("tenantId", tenantId); params.put("startTime", convertDate(markingCouponDataReportDto.getStartTime())); params.put("endTime", convertDateAndAdd(convertDate(markingCouponDataReportDto.getEndTime()), 1)); + if(markingCouponDataReportDto.getCouponType()!=null){ + params.put("couponType", markingCouponDataReportDto.getCouponType()); + } + PageHelper.startPage(pageIndex, pageSize); List couponDatalist = wxCouponOrderMapper.couponDataList(params); if(couponDatalist.isEmpty()){ diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 5aca80900..8ecfc2755 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -387,11 +387,17 @@