|
@@ -79,7 +79,6 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
|
|
|
if (Check.isNull(saleTeaMber)) {
|
|
|
saleTeaMber = Arrays.asList(userId);
|
|
|
- return Result.error("未查询到人员!");
|
|
|
}
|
|
|
//账户集合
|
|
|
List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber);
|
|
@@ -91,7 +90,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
data.put("monthlyGoalValue", monthly);
|
|
|
result = Result.ok(data);
|
|
|
//分公司总经理
|
|
|
- } else if ("CompanyManager".equals(roleCode)) {
|
|
|
+ } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
//账户集合
|
|
|
List<Long> accountIds = baseMapper.getCompanyAccountIds(companyId, mediaId);
|
|
|
JSONObject data = getManagerData(accountIds, userId, mediaId, companyId);
|
|
@@ -128,7 +127,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//月消耗
|
|
|
String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
|
result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
- result.put("monthCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
+ result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
|
|
|
//现金消耗 + 环比ROI
|
|
|
JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
@@ -140,7 +139,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//月消耗
|
|
|
String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
|
result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
- result.put("monthCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
+ result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
|
|
|
//现金消耗 + 环比ROI
|
|
|
JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
@@ -163,7 +162,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
QueryWrapper<ManagerSaleValue> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("company_id", sale.getCompanyId());
|
|
|
queryWrapper.eq("media_id", sale.getMediaId());
|
|
|
- queryWrapper.eq("manage_id", sale.getUserId());
|
|
|
+ queryWrapper.eq("user_id", sale.getUserId());
|
|
|
ManagerSaleValue one = this.getOne(queryWrapper);
|
|
|
if (Check.isNull(one)) {
|
|
|
sale.setId(UUID.randomUUID().toString().replace("-", ""));
|
|
@@ -215,7 +214,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
}
|
|
|
//分公司总经理
|
|
|
- } else if ("CompanyManager".equals(roleCode)) {
|
|
|
+ } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
if (startTime.equals(endTime)) {
|
|
|
data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime);
|
|
|
} else {
|
|
@@ -244,11 +243,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
result.put("list", list);
|
|
|
//平台消耗
|
|
|
if (compayAllAccountIds == null) {
|
|
|
- result.put("platformCharge", result.getString("charge"));
|
|
|
+ result.put("platformCharge", result.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", result.getString("chargeRoi"));
|
|
|
} else {
|
|
|
JSONObject ptdata = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds);
|
|
|
- result.put("platformCharge", ptdata.getString("charge"));
|
|
|
+ result.put("platformCharge", ptdata.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
|
|
|
}
|
|
|
} else if ("2".equals(mediaId)) {
|
|
@@ -257,11 +256,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
result.put("list", list);
|
|
|
//平台消耗
|
|
|
if (compayAllAccountIds == null) {
|
|
|
- result.put("platformCharge", result.getString("charge"));
|
|
|
+ result.put("platformCharge", result.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", result.getString("chargeRoi"));
|
|
|
} else {
|
|
|
JSONObject ptdata = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds);
|
|
|
- result.put("platformCharge", ptdata.getString("charge"));
|
|
|
+ result.put("platformCharge", ptdata.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
|
|
|
}
|
|
|
}
|
|
@@ -340,7 +339,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
return getProjectDailyCharges(projectIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
//分公司总经理
|
|
|
- } else if ("CompanyManager".equals(roleCode)) {
|
|
|
+ } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
List<Long> projectIds = baseMapper.querySalesDirectorProjectIds(companyId, mediaId, null);
|
|
|
if (startTime.equals(endTime)) {
|
|
|
return getProjectDailyCharges(projectIds, mediaId, startTime, null, pageNo, pageSize);
|
|
@@ -354,24 +353,26 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
private PageInfo getProjectDailyCharges(List<Long> projectIds, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
Long days = 1L;
|
|
|
+ Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
|
|
|
if (endTime == null) {
|
|
|
endTime = startTime;
|
|
|
} else {
|
|
|
days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
|
|
|
+ hour = 23;
|
|
|
}
|
|
|
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
Long total = baseMapper.queryTtHourProjectTopTotal(projectIds, startTime, endTime);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days, hour);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
Long total = baseMapper.queryKsHourProjectTopTotal(projectIds, startTime, endTime);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days, hour);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|