|
@@ -358,48 +358,48 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
|
|
|
if (!Check.isNull(yesterdayJson)) {
|
|
|
String yesterdayStatHour = yesterdayJson.getString("statHour");
|
|
|
JSONObject nowJson = reportMapper.selectDayHourlyByHourAndDate(nowDate, yesterdayStatHour);
|
|
|
- if (Check.isNull(nowJson)) {
|
|
|
- continue;
|
|
|
- }
|
|
|
- nowJson.put("statDate", nowDate);
|
|
|
- BigDecimal cost = nowJson.getBigDecimal("cost"); // 今日消耗
|
|
|
- BigDecimal yesterdayCost = yesterdayJson.getBigDecimal("cost");// 昨日消耗
|
|
|
- BigDecimal compareBigDecimal = new BigDecimal(0);
|
|
|
- if (yesterdayCost.compareTo(compareBigDecimal) != 0) {
|
|
|
- BigDecimal costProportion = ((cost.subtract(yesterdayCost))).divide(yesterdayCost, BigDecimal.ROUND_HALF_UP, 2);
|
|
|
- nowJson.put("costProportion", costProportion); // 较昨日增加比例
|
|
|
- } else {
|
|
|
- nowJson.put("costProportion", 0); // 较昨日增加比例
|
|
|
- }
|
|
|
+ if (!Check.isNull(nowJson)) {
|
|
|
+ nowJson.put("statDate", nowDate);
|
|
|
+ BigDecimal cost = nowJson.getBigDecimal("cost"); // 今日消耗
|
|
|
+ BigDecimal yesterdayCost = yesterdayJson.getBigDecimal("cost");// 昨日消耗
|
|
|
+ BigDecimal compareBigDecimal = new BigDecimal(0);
|
|
|
+ if (yesterdayCost.compareTo(compareBigDecimal) != 0) {
|
|
|
+ BigDecimal costProportion = ((cost.subtract(yesterdayCost))).divide(yesterdayCost, BigDecimal.ROUND_HALF_UP, 2);
|
|
|
+ nowJson.put("costProportion", costProportion); // 较昨日增加比例
|
|
|
+ } else {
|
|
|
+ nowJson.put("costProportion", 0); // 较昨日增加比例
|
|
|
+ }
|
|
|
|
|
|
- Long photoShow = nowJson.getLong("photoShow");// 今日封面展示
|
|
|
- Long yesterdayPhotoShow = yesterdayJson.getLong("photoShow");// 昨日封面展示
|
|
|
- if (yesterdayPhotoShow != 0L) {
|
|
|
- double showProportion = (photoShow.doubleValue() - yesterdayPhotoShow.doubleValue()) / yesterdayPhotoShow.doubleValue();
|
|
|
- nowJson.put("showProportion", showProportion); // 较昨日增加比例
|
|
|
- } else {
|
|
|
- nowJson.put("showProportion", 0); // 较昨日增加比例
|
|
|
- }
|
|
|
+ Long photoShow = nowJson.getLong("photoShow");// 今日封面展示
|
|
|
+ Long yesterdayPhotoShow = yesterdayJson.getLong("photoShow");// 昨日封面展示
|
|
|
+ if (yesterdayPhotoShow != 0L) {
|
|
|
+ double showProportion = (photoShow.doubleValue() - yesterdayPhotoShow.doubleValue()) / yesterdayPhotoShow.doubleValue();
|
|
|
+ nowJson.put("showProportion", showProportion); // 较昨日增加比例
|
|
|
+ } else {
|
|
|
+ nowJson.put("showProportion", 0); // 较昨日增加比例
|
|
|
+ }
|
|
|
|
|
|
- Long photoClick = nowJson.getLong("photoClick");// 今日封面展示
|
|
|
- Long yesterdayPhotoClick = yesterdayJson.getLong("photoClick");// 昨日封面展示
|
|
|
- if (yesterdayPhotoClick != 0L) {
|
|
|
- double photoClickProportion = (photoClick.doubleValue() - yesterdayPhotoClick.doubleValue()) / yesterdayPhotoClick.doubleValue();
|
|
|
- nowJson.put("photoClickProportion", photoClickProportion); // 较昨日增加比例
|
|
|
- } else {
|
|
|
- nowJson.put("photoClickProportion", 0); // 较昨日增加比例
|
|
|
- }
|
|
|
+ Long photoClick = nowJson.getLong("photoClick");// 今日封面展示
|
|
|
+ Long yesterdayPhotoClick = yesterdayJson.getLong("photoClick");// 昨日封面展示
|
|
|
+ if (yesterdayPhotoClick != 0L) {
|
|
|
+ double photoClickProportion = (photoClick.doubleValue() - yesterdayPhotoClick.doubleValue()) / yesterdayPhotoClick.doubleValue();
|
|
|
+ nowJson.put("photoClickProportion", photoClickProportion); // 较昨日增加比例
|
|
|
+ } else {
|
|
|
+ nowJson.put("photoClickProportion", 0); // 较昨日增加比例
|
|
|
+ }
|
|
|
|
|
|
- Long aClick = nowJson.getLong("aclick");// 今日封面展示
|
|
|
- Long yesterdayAClick = yesterdayJson.getLong("aclick");// 昨日封面展示
|
|
|
- if (yesterdayAClick != 0L) {
|
|
|
- double aClickProportion = (aClick.doubleValue() - yesterdayAClick.doubleValue()) / yesterdayAClick.doubleValue();
|
|
|
- nowJson.put("aClickProportion", aClickProportion); // 较昨日增加比例
|
|
|
- } else {
|
|
|
- nowJson.put("aClickProportion", 0); // 较昨日增加比例
|
|
|
+ Long aClick = nowJson.getLong("aclick");// 今日封面展示
|
|
|
+ Long yesterdayAClick = yesterdayJson.getLong("aclick");// 昨日封面展示
|
|
|
+ if (yesterdayAClick != 0L) {
|
|
|
+ double aClickProportion = (aClick.doubleValue() - yesterdayAClick.doubleValue()) / yesterdayAClick.doubleValue();
|
|
|
+ nowJson.put("aClickProportion", aClickProportion); // 较昨日增加比例
|
|
|
+ } else {
|
|
|
+ nowJson.put("aClickProportion", 0); // 较昨日增加比例
|
|
|
+ }
|
|
|
+ yesterdayJson.put("now", nowJson);
|
|
|
}
|
|
|
- yesterdayJson.put("now", nowJson);
|
|
|
}
|
|
|
+
|
|
|
detail.add(yesterdayJson);
|
|
|
}
|
|
|
|