|
@@ -213,6 +213,8 @@ public class DashboardServiceImpl implements DashboardService {
|
|
|
? compareSales.divide(BigDecimal.valueOf(compareOrderCount), 2, RoundingMode.HALF_UP)
|
|
? compareSales.divide(BigDecimal.valueOf(compareOrderCount), 2, RoundingMode.HALF_UP)
|
|
|
: BigDecimal.ZERO;
|
|
: BigDecimal.ZERO;
|
|
|
|
|
|
|
|
|
|
+ BigDecimal avgOrderPrice = totalOrders > 0
|
|
|
|
|
+ ? totalSales.divide(BigDecimal.valueOf(totalOrders), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
|
|
|
result.put("salesGrowth", formatGrowth(totalSales, compareSales));
|
|
result.put("salesGrowth", formatGrowth(totalSales, compareSales));
|
|
|
result.put("ordersGrowth", formatGrowth(totalOrders, compareOrderCount));
|
|
result.put("ordersGrowth", formatGrowth(totalOrders, compareOrderCount));
|
|
|
result.put("avgOrderGrowth", formatGrowth(avgOrderPrice, compareAvgPrice));
|
|
result.put("avgOrderGrowth", formatGrowth(avgOrderPrice, compareAvgPrice));
|
|
@@ -247,6 +249,8 @@ public class DashboardServiceImpl implements DashboardService {
|
|
|
? compareSales.divide(BigDecimal.valueOf(compareTransactUserIds.size()), 2, RoundingMode.HALF_UP)
|
|
? compareSales.divide(BigDecimal.valueOf(compareTransactUserIds.size()), 2, RoundingMode.HALF_UP)
|
|
|
: BigDecimal.ZERO;
|
|
: BigDecimal.ZERO;
|
|
|
|
|
|
|
|
|
|
+ BigDecimal customerPrice = transactUserIds.size() > 0
|
|
|
|
|
+ ? totalSales.divide(BigDecimal.valueOf(transactUserIds.size()), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
|
|
|
result.put("newUsersGrowth", formatGrowth(newUsers, compareNewUsers));
|
|
result.put("newUsersGrowth", formatGrowth(newUsers, compareNewUsers));
|
|
|
result.put("transactGrowth", formatGrowth(transactUserIds.size(), compareTransactUserIds.size()));
|
|
result.put("transactGrowth", formatGrowth(transactUserIds.size(), compareTransactUserIds.size()));
|
|
|
result.put("customerGrowth", formatGrowth(customerPrice, compareCustomerPrice));
|
|
result.put("customerGrowth", formatGrowth(customerPrice, compareCustomerPrice));
|