|
@@ -39,6 +39,9 @@ public class BytedanceAccountReportServiceImpl implements IBytedanceAccountRepor
|
|
|
return result;
|
|
|
}
|
|
|
before = bytedanceAccountReportMapper.queryTodaySumByHour(DateUtils.getAnotherDay(SystemDateConstant.yyyy_MM_dd, startDate, -1), after.getInteger("maxHour"), accounts);
|
|
|
+ if(before==null){
|
|
|
+ return result;
|
|
|
+ }
|
|
|
} else {
|
|
|
after = bytedanceAccountReportMapper.querySumByStartEndDate(endDate, startDate, accounts);
|
|
|
if(after==null){
|
|
@@ -56,11 +59,11 @@ public class BytedanceAccountReportServiceImpl implements IBytedanceAccountRepor
|
|
|
String filedAll = JsonResourceUtil.joinAllFiled();
|
|
|
if (startDate.equals(endDate)) {
|
|
|
List<JSONObject> after = bytedanceAccountReportMapper.queryTodayDetailReportBy(filedAll, startDate, accounts);
|
|
|
- if(after==null){
|
|
|
+ List<JSONObject> before = bytedanceAccountReportMapper.queryTodayDetailReportBy(filedAll, DateUtils.getAnotherDay(SystemDateConstant.yyyy_MM_dd, startDate, -1), accounts);
|
|
|
+ if(after==null||before==null){
|
|
|
return result;
|
|
|
}
|
|
|
List<JSONObject> afterDis = this.countDiscountCost(mediaId, discount, after);
|
|
|
- List<JSONObject> before = bytedanceAccountReportMapper.queryTodayDetailReportBy(filedAll, DateUtils.getAnotherDay(SystemDateConstant.yyyy_MM_dd, startDate, -1), accounts);
|
|
|
List<JSONObject> beforeDis = this.countDiscountCost(mediaId, discount, before);
|
|
|
result = LinkUtils.getCompareDate(beforeDis, afterDis, "statHour");
|
|
|
} else {
|