|
@@ -480,7 +480,6 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
chainRatioJson.put("beforeActivationPriceProportion", 0);
|
|
chainRatioJson.put("beforeActivationPriceProportion", 0);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
// 转化提交单价
|
|
// 转化提交单价
|
|
BigDecimal nowAfterActivationPrice = nowAccountSummary.getBigDecimal("afterActivationPrice");
|
|
BigDecimal nowAfterActivationPrice = nowAccountSummary.getBigDecimal("afterActivationPrice");
|
|
BigDecimal yesterdayAfterActivationPrice = yesterdayAccountSummary.getBigDecimal("afterActivationPrice");
|
|
BigDecimal yesterdayAfterActivationPrice = yesterdayAccountSummary.getBigDecimal("afterActivationPrice");
|
|
@@ -495,8 +494,39 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
} else {
|
|
} else {
|
|
chainRatioJson.put("afterActivationPriceProportion", 0);
|
|
chainRatioJson.put("afterActivationPriceProportion", 0);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ BigDecimal nowEventRegisterCost = nowAccountSummary.getBigDecimal("eventRegisterCost"); // 今日注册成本
|
|
|
|
+ BigDecimal yesterdayEventRegisterCost = yesterdayAccountSummary.getBigDecimal("eventRegisterCost"); // 昨日注册成本
|
|
|
|
+ if (!Check.isNull(nowEventRegisterCost) && !Check.isNull(yesterdayEventRegisterCost)) {
|
|
|
|
+ if (yesterdayEventRegisterCost.compareTo(new BigDecimal(0)) != 0) {
|
|
|
|
+ BigDecimal eventRegisterCostProportion = (nowEventRegisterCost.subtract(yesterdayEventRegisterCost)).divide(yesterdayEventRegisterCost, 4, RoundingMode.HALF_UP);
|
|
|
|
+ chainRatioJson.put("eventRegisterCostProportion", eventRegisterCostProportion);
|
|
|
|
+ } else {
|
|
|
|
+ chainRatioJson.put("eventRegisterCostProportion", 0);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ chainRatioJson.put("eventRegisterCostProportion", 0);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ BigDecimal nowEventRegister = nowAccountSummary.getBigDecimal("eventRegister"); // 今日注册数
|
|
|
|
+ BigDecimal yesterdayEventRegister = yesterdayAccountSummary.getBigDecimal("eventRegister"); // 昨日注册数
|
|
|
|
+ if (!Check.isNull(nowEventRegister) && !Check.isNull(yesterdayEventRegister)) {
|
|
|
|
+ if (yesterdayEventRegister.compareTo(new BigDecimal(0)) != 0) {
|
|
|
|
+ BigDecimal eventRegisterProportion = (nowEventRegister.subtract(yesterdayEventRegister)).divide(yesterdayEventRegister, 4, RoundingMode.HALF_UP);
|
|
|
|
+ chainRatioJson.put("eventRegisterProportion", eventRegisterProportion);
|
|
|
|
+ } else {
|
|
|
|
+ chainRatioJson.put("eventRegisterProportion", 0);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ chainRatioJson.put("eventRegisterProportion", 0);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
returnJson.put("chainRatio", chainRatioJson);
|
|
returnJson.put("chainRatio", chainRatioJson);
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
} else if (type == 2) {
|
|
} else if (type == 2) {
|
|
queryMap.put("statDate", anotherDay);
|
|
queryMap.put("statDate", anotherDay);
|
|
@@ -581,6 +611,4 @@ public class AccountReportServiceImpl implements IAccountReportService {
|
|
}
|
|
}
|
|
return returnJson;
|
|
return returnJson;
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|