|
@@ -124,27 +124,27 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
//查询当日消耗 + 环比
|
|
|
- result = baseMapper.queryTtTodayCharge(statDay, hour, accountIds);
|
|
|
+ result = baseMapper.queryTtTodayCharge(statDay, hour, accountIds, companyId);
|
|
|
//周消耗
|
|
|
- weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds);
|
|
|
+ weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds, companyId);
|
|
|
//月消耗
|
|
|
- String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
|
+ String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds, companyId);
|
|
|
result.put("weekCharge", new BigDecimal(weekCharge));
|
|
|
result.put("monthCharge", new BigDecimal(monthCharge));
|
|
|
//现金消耗 + 环比ROI
|
|
|
- JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
|
+ JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, companyId);
|
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
|
result.put("realChargedRoi", realCharged.getString("realChargedRoi"));
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
- result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds);
|
|
|
+ result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds, companyId);
|
|
|
//周消耗
|
|
|
- weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds);
|
|
|
+ weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds, companyId);
|
|
|
//月消耗
|
|
|
- String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
|
+ String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds, companyId);
|
|
|
result.put("weekCharge", new BigDecimal(weekCharge));
|
|
|
result.put("monthCharge", new BigDecimal(monthCharge));
|
|
|
//现金消耗 + 环比ROI
|
|
|
- JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
|
+ JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, companyId);
|
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
|
result.put("realChargedRoi", realCharged.getString("realChargedRoi"));
|
|
|
}
|
|
@@ -243,28 +243,28 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
//查询 消耗 + 环比
|
|
|
- result = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, accountIds);
|
|
|
- List<JSONObject> list = baseMapper.queryTtManydaysCharge(startTime, endTime, accountIds);
|
|
|
+ result = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, accountIds, companyId);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtManydaysCharge(startTime, endTime, accountIds, companyId);
|
|
|
result.put("list", list);
|
|
|
//平台消耗
|
|
|
if (compayAllAccountIds == null) {
|
|
|
result.put("platformCharge", result.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", result.getString("chargeRoi"));
|
|
|
} else {
|
|
|
- JSONObject ptdata = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds);
|
|
|
+ JSONObject ptdata = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds, companyId);
|
|
|
result.put("platformCharge", ptdata.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
|
|
|
}
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
- result = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, accountIds);
|
|
|
- List<JSONObject> list = baseMapper.queryKsManydaysCharge(startTime, endTime, accountIds);
|
|
|
+ result = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, accountIds, companyId);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsManydaysCharge(startTime, endTime, accountIds, companyId);
|
|
|
result.put("list", list);
|
|
|
//平台消耗
|
|
|
if (compayAllAccountIds == null) {
|
|
|
result.put("platformCharge", result.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", result.getString("chargeRoi"));
|
|
|
} else {
|
|
|
- JSONObject ptdata = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds);
|
|
|
+ JSONObject ptdata = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds, companyId);
|
|
|
result.put("platformCharge", ptdata.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
|
|
|
}
|
|
@@ -283,28 +283,28 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
//查询当日消耗 + 环比
|
|
|
- result = baseMapper.queryTtTodayCharge(date, hour, accountIds);
|
|
|
- List<JSONObject> list = baseMapper.queryTtHourList(date, accountIds);
|
|
|
+ result = baseMapper.queryTtTodayCharge(date, hour, accountIds, companyId);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtHourList(date, accountIds, companyId);
|
|
|
result.put("list", list);
|
|
|
//平台消耗
|
|
|
if (compayAllAccountIds == null) {
|
|
|
result.put("platformCharge", result.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", result.getString("chargeRoi"));
|
|
|
} else {
|
|
|
- JSONObject ptdata = baseMapper.queryTtTodayCharge(date, hour, compayAllAccountIds);
|
|
|
+ JSONObject ptdata = baseMapper.queryTtTodayCharge(date, hour, compayAllAccountIds, companyId);
|
|
|
result.put("platformCharge", ptdata.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
|
|
|
}
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
- result = baseMapper.queryKsTodayCharge(date, hour, accountIds);
|
|
|
- List<JSONObject> list = baseMapper.queryKsHourList(date, accountIds);
|
|
|
+ result = baseMapper.queryKsTodayCharge(date, hour, accountIds, companyId);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsHourList(date, accountIds, companyId);
|
|
|
result.put("list", list);
|
|
|
//平台消耗
|
|
|
if (compayAllAccountIds == null) {
|
|
|
result.put("platformCharge", result.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", result.getString("chargeRoi"));
|
|
|
} else {
|
|
|
- JSONObject ptdata = baseMapper.queryKsTodayCharge(date, hour, compayAllAccountIds);
|
|
|
+ JSONObject ptdata = baseMapper.queryKsTodayCharge(date, hour, compayAllAccountIds, companyId);
|
|
|
result.put("platformCharge", ptdata.getString("totalCharge"));
|
|
|
result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
|
|
|
}
|
|
@@ -326,9 +326,9 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
throw new Exception("未查询到账户!");
|
|
|
}
|
|
|
if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(accountIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -341,9 +341,9 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
throw new Exception("未查询到账户!");
|
|
|
}
|
|
|
if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(accountIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
//分公司总经理
|
|
|
} else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
@@ -353,16 +353,16 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
throw new Exception("未查询到账户!");
|
|
|
}
|
|
|
if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(accountIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
} else {
|
|
|
throw new Exception("该用户角色权限不足!");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private PageInfo getProjectDailyCharges(List<Long> accountIds, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
+ private PageInfo getProjectDailyCharges(List<Long> accountIds, String companyId, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
Long days = 1L;
|
|
|
Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
|
|
|
if (endTime == null) {
|
|
@@ -373,16 +373,16 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
}
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
- Long total = baseMapper.queryTtHourProjectTopTotal(accountIds, startTime, endTime);
|
|
|
+ Long total = baseMapper.queryTtHourProjectTopTotal(accountIds, startTime, endTime, companyId);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryTtHourProjectTop(accountIds, startTime, endTime, days, hour);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtHourProjectTop(accountIds, startTime, endTime, days, hour, companyId);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
- Long total = baseMapper.queryKsHourProjectTopTotal(accountIds, startTime, endTime);
|
|
|
+ Long total = baseMapper.queryKsHourProjectTopTotal(accountIds, startTime, endTime, companyId);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryKsHourProjectTop(accountIds, startTime, endTime, days, hour);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsHourProjectTop(accountIds, startTime, endTime, days, hour, companyId);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|