From d1eacee98fb9e220fac89cdae003426578f2ad85 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 16 Nov 2018 18:39:39 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E6=94=B9]:=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=94=E5=8F=B0=E5=88=B8=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=90=8D=E7=A7=B0=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/MarkingCouponDataReportDto.java | 13 ++++++++++--- .../service/impl/MarkingDataReportServiceImpl.java | 3 +++ .../main/resources/mapper/WxCouponOrderMapper.xml | 3 +++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 9352b3cb4..8b3ad4ff2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -11,6 +11,7 @@ public class MarkingCouponDataReportDto { private Date endTime; private Integer type; private Integer couponType; + private String couponTitle; public Integer getType() { return type; @@ -36,11 +37,17 @@ public class MarkingCouponDataReportDto { this.endTime = endTime; } - public Integer getCouponType() { - return couponType; - } + public Integer getCouponType() { return couponType; } public void setCouponType(Integer couponType) { this.couponType = couponType; } + + public String getCouponTitle() { + return couponTitle; + } + + public void setCouponTitle(String couponTitle) { + this.couponTitle = couponTitle; + } } 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 95017bc52..e921ad979 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -267,6 +267,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if(markingCouponDataReportDto.getCouponType()!=null){ params.put("couponType", markingCouponDataReportDto.getCouponType()); } + if(markingCouponDataReportDto.getCouponType()!=null){ + params.put("couponTitle", markingCouponDataReportDto.getCouponTitle()); + } PageHelper.startPage(pageIndex, pageSize); List couponDatalist = wxCouponOrderMapper.couponDataList(params); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index e783ad94e..aab7b5e16 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -408,6 +408,9 @@ and wx_coupon.type = #{couponType} + + and wx_coupon.title like concat('%', #{couponTitle},'%') + GROUP BY createTime,couponId order by createTime desc