|
|
|
@@ -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<String, Object> 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<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataMap(params); |
|
|
|
// HashMap<String, Object> 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<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderService.couponDataMap(tenantEntity,addDay(-30),addDay(1)); |
|
|
|
//查询券领取人数 |
|
|
|
|
|
|
|
String startdate = DateUtils.getTimeBefore(30, new Date()); |
|
|
|
|