|
|
|
@@ -343,8 +343,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
public PageInfo<MarkingSceneDataVo> getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { |
|
|
|
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); |
|
|
|
MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto(); |
|
|
|
queryDto.setTenantEntitys(tenantEntitys); |
|
|
|
org.springframework.beans.BeanUtils.copyProperties(markingCouponDataReportDto, queryDto); |
|
|
|
queryDto.setTenantEntitys(tenantEntitys); |
|
|
|
queryDto.updateTenantInfo(tenantEntity); |
|
|
|
|
|
|
|
HashMap<String, Object> params = new HashMap<>(); |
|
|
|
@@ -391,6 +391,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
Map<String, Integer> countMap = new HashMap<>(); |
|
|
|
|
|
|
|
params.clear(); |
|
|
|
params.put("tenantEntitys",tenantEntitys); |
|
|
|
params.put("tenantId", tenantEntity.getTenantId()); |
|
|
|
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { |
|
|
|
params.put("parentTenantId", tenantEntity.getParentTenantId()); |
|
|
|
@@ -445,6 +446,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
Map<String, Integer> triggerCountMap = new HashMap<>(); |
|
|
|
|
|
|
|
params.clear(); |
|
|
|
params.put("tenantEntitys",tenantEntitys); |
|
|
|
params.put("tenantId", tenantEntity.getTenantId()); |
|
|
|
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { |
|
|
|
params.put("parentTenantId", tenantEntity.getParentTenantId()); |
|
|
|
|