|
@@ -30,9 +30,7 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
if (Check.isNull(json)) {
|
|
if (Check.isNull(json)) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
-
|
|
|
|
JSONArray accountIds = json.getJSONArray("accountIds");
|
|
JSONArray accountIds = json.getJSONArray("accountIds");
|
|
- System.err.println(accountIds);
|
|
|
|
if (Check.isNull(accountIds)) {
|
|
if (Check.isNull(accountIds)) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
@@ -150,7 +148,6 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
nowJson.put("aClickProportion", 0); // 较昨日增加比例
|
|
nowJson.put("aClickProportion", 0); // 较昨日增加比例
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
BigDecimal discountCost = cost.divide(discount, BigDecimal.ROUND_HALF_UP, 2);
|
|
BigDecimal discountCost = cost.divide(discount, BigDecimal.ROUND_HALF_UP, 2);
|
|
nowJson.put("discountCost", discountCost); // 折后消耗
|
|
nowJson.put("discountCost", discountCost); // 折后消耗
|
|
BigDecimal yesterdayDiscountCost = yesterdayCost.divide(discount, BigDecimal.ROUND_HALF_UP, 2);
|
|
BigDecimal yesterdayDiscountCost = yesterdayCost.divide(discount, BigDecimal.ROUND_HALF_UP, 2);
|
|
@@ -250,7 +247,6 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
hour = statHour;
|
|
hour = statHour;
|
|
}
|
|
}
|
|
JSONObject chainRatioJson = new JSONObject();
|
|
JSONObject chainRatioJson = new JSONObject();
|
|
- System.out.println(hour);
|
|
|
|
accountDetail = accountReportMapper.selectReportDetailGroupAccountId(nowDate, accountIds, hour);
|
|
accountDetail = accountReportMapper.selectReportDetailGroupAccountId(nowDate, accountIds, hour);
|
|
JSONObject nowAccountSummary = accountReportMapper.selectSummaryByAccountId(nowDate, accountIds, hour);
|
|
JSONObject nowAccountSummary = accountReportMapper.selectSummaryByAccountId(nowDate, accountIds, hour);
|
|
if (!Check.isNull(nowAccountSummary)) {
|
|
if (!Check.isNull(nowAccountSummary)) {
|
|
@@ -415,20 +411,12 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
}
|
|
}
|
|
|
|
|
|
returnJson.put("accountDetail", accountDetail);
|
|
returnJson.put("accountDetail", accountDetail);
|
|
- System.err.println(returnJson);
|
|
|
|
-
|
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
return returnJson;
|
|
return returnJson;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
- public static void main(String[] args) {
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
}
|
|
}
|