From f473bdeea5341a750a520f145ebf723bdfba95ea Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 14 Jan 2022 15:21:14 +0800 Subject: [PATCH] =?UTF-8?q?fix=20a=E7=AB=AF=E6=AF=8F=E6=97=A5=E5=88=B8?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MarkingDataReportServiceImpl.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 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 12a8be7df..e325a5f34 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -55,6 +56,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { private WxMallMapper wxMallMapper; @Autowired private ExcelService excelService; + + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; @@ -112,15 +115,15 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } //couponData - HashMap params = new HashMap<>(); - params.put("tenantEntitys",tenantEntitys); - params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - params.put("parentTenantId", tenantEntity.getParentTenantId()); - } - params.put("startTime", addDay(-30)); - params.put("endTime", addDay(1)); - List couponDatalist = wxCouponOrderMapper.couponDataMap(params); +// HashMap params = new HashMap<>(); +// params.put("tenantEntitys",tenantEntitys); +// params.put("tenantId", tenantEntity.getTenantId()); +// if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { +// params.put("parentTenantId", tenantEntity.getParentTenantId()); +// } +// params.put("startTime", addDay(-30)); +// params.put("endTime", addDay(1)); + List couponDatalist = wxCouponOrderService.couponDataMap(tenantEntity,addDay(-30),addDay(1)); //查询券领取人数 String startdate = DateUtils.getTimeBefore(30, new Date());