diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index ebb485bf3..688811793 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -591,10 +591,9 @@ public class DashboardServiceImpl implements DashboardService, DashboardAnalysis } params.put("channel", record.getString("channel")); int newCustomers = 0; - int oldCustomers = transactionAnalysisMapper.countOldCustomers(params); - if (client.getIntValue("client_id") == 0) { - newCustomers = record.getIntValue("customers") - oldCustomers; - } else { + int oldCustomers=0; + if (client.getIntValue("client_id") != 0) { + oldCustomers = transactionAnalysisMapper.countOldCustomers(params); newCustomers = transactionAnalysisMapper.countNewCustomers(params); } record.put("new_customers", newCustomers); diff --git a/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java b/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java index 9003942f1..a89e3e032 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java @@ -23,7 +23,7 @@ public class DashboardTaskManager { @Resource private SynchronizedScheduler synchronizedScheduler; - @Scheduled(cron = "0 0 2 * * ?") + @Scheduled(cron = "0 30 1 * * ?") public void analysisDashboard() { synchronizedScheduler.executeProcess("manage_task:dashboardTask", 120_000, () -> dashboardService.generateCustomersAndOrdersStatistics(DateUtils.addDays(new Date(), -1)));