Commit 6caf0a3a by 王祖波

销售引擎服务

parent 6ebbb0da
......@@ -144,7 +144,7 @@ public class MaterialReportContext {
if (CollectionUtils.isNotEmpty(rightMenuCodeList)) {
if (rightMenuCodeList.size() > 1) {
title = "门店";
}else if (rightMenuCodeList.contains(EnterpriseServiceEnum.CONTENT.getRightMenuCode())){
}else if (rightMenuCodeList.contains(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode())){
title = "潜客雷达";
}
}
......
......@@ -68,7 +68,7 @@ public class MaterialEnterpriseAdaptor {
ServiceResponse<List<EnterpriseUsingStatusDTO>> serviceResponse1 =
enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.CONTENT.getRightMenuCode(), null);
ServiceResponse<List<EnterpriseUsingStatusDTO>> serviceResponse2 =
enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.APPOINTMENT.getRightMenuCode(), null);
enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode(), null);
if (!serviceResponse1.isSuccess() || !serviceResponse2.isSuccess()) {
return Collections.emptyMap();
......@@ -91,7 +91,7 @@ public class MaterialEnterpriseAdaptor {
.filter(item -> Boolean.TRUE.equals(item.getVaild()))
.map(EnterpriseUsingStatusDTO::getEnterpriseId)
.forEach(eid -> map.computeIfAbsent(eid, k -> new ArrayList<>())
.add(EnterpriseServiceEnum.APPOINTMENT.getRightMenuCode()));
.add(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode()));
return map;
}
......
......@@ -108,7 +108,7 @@ public class WeekMonthDataAdaptor {
MaterialDataResult contentResult = queryClerkReportDataContent(enterpriseId, clerkId, storeId, reportType, bizDate);
MaterialDataResult potentialResult = queryReportDataPotential(enterpriseId, clerkId, Lists.newArrayList(storeId), reportType, bizDate);
return new MaterialDataResult(potentialResult.getFirstValue(),contentResult.getSecondValue());
} else if (rightMenuCodeList.contains(EnterpriseServiceEnum.APPOINTMENT.getRightMenuCode())) {
} else if (rightMenuCodeList.contains(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode())) {
return queryReportDataPotential(enterpriseId, clerkId, Lists.newArrayList(storeId), reportType, bizDate);
} else if (rightMenuCodeList.contains(EnterpriseServiceEnum.CONTENT.getRightMenuCode())) {
return queryClerkReportDataContent(enterpriseId, clerkId, storeId, reportType, bizDate);
......@@ -128,7 +128,7 @@ public class WeekMonthDataAdaptor {
MaterialDataResult contentResult = queryAreaReportDataContent(enterpriseId, clerkId, storeIds, reportType, bizDate);
MaterialDataResult potentialResult = queryReportDataPotential(enterpriseId, clerkId, storeIds, reportType, bizDate);
return new MaterialDataResult(potentialResult.getFirstValue(),contentResult.getSecondValue());
} else if (rightMenuCodeList.contains(EnterpriseServiceEnum.APPOINTMENT.getRightMenuCode())) {
} else if (rightMenuCodeList.contains(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode())) {
return queryReportDataPotential(enterpriseId, clerkId, storeIds, reportType, bizDate);
} else if (rightMenuCodeList.contains(EnterpriseServiceEnum.CONTENT.getRightMenuCode())) {
return queryAreaReportDataContent(enterpriseId, clerkId, storeIds, reportType, bizDate);
......
......@@ -156,7 +156,7 @@ public class WeekMonthReportBuilder {
if (rightMenuCodeList.size() > 1) {
return DrawImageUtils.templateMap.get(key);
}
else if (rightMenuCodeList.contains(EnterpriseServiceEnum.APPOINTMENT.getRightMenuCode())) {
else if (rightMenuCodeList.contains(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode())) {
key = "POTENTIAL_" + key;
return DrawImageUtils.templateMap.get(key);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment