|
@@ -61,7 +61,7 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
|
// 昨日 小时汇总数据
|
|
|
JSONObject yesterdayJson = accountReportMapper.selectSumDayHourlyByHourAndDate(anotherDay, maxHourStr, accountIds);
|
|
|
accountJson.put("maxHour", maxHour);
|
|
|
- if (!Check.isNull(accountJson)) {
|
|
|
+ if (!Check.isNull(accountJson) && !Check.isNull(yesterdayJson)) {
|
|
|
// 今日消耗
|
|
|
BigDecimal cost = accountJson.getBigDecimal("cost");
|
|
|
// 昨日消耗
|
|
@@ -331,7 +331,7 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
|
Long nowAClick = nowAccountSummary.getLong("aclick");
|
|
|
Long yesterdayAClick = yesterdayAccountSummary.getLong("aclick");
|
|
|
//爆光环比
|
|
|
- if (!Check.isNull(nowAClick) && !Check.isNull(nowAClick)) {
|
|
|
+ if (!Check.isNull(nowAClick) && !Check.isNull(yesterdayAClick)) {
|
|
|
if (yesterdayAClick != 0L) {
|
|
|
double aClickProportion = (nowAClick.doubleValue() - yesterdayAClick.doubleValue()) / yesterdayAClick.doubleValue();
|
|
|
chainRatioJson.put("aClickProportion", aClickProportion);
|