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 @@