merge conflict

src/main/java/au/com/royalpay/payment/manage/task/BillOrderCheckTask.java

@@ -27,7 +27,7 @@ public class BillOrderCheckTask {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 0/3 * * * ?")
-    public void checkGreenChannel() {
+    public void checkBillOrderCheck() {
         synchronizedScheduler.executeProcess("manage_task:checkGreenChannel", 120_000, () -> {
             List<String> orderIds = billOrderMapper.findOrderIdByStatus("0");
             if (CollectionUtils.isEmpty(orderIds)) {

src/main/java/au/com/royalpay/payment/manage/task/CheckPartnerAuthStatusAndSendMessageTask.java

@@ -25,8 +25,8 @@ public class CheckPartnerAuthStatusAndSendMessageTask {
 //        simpleClientService.checkAuthAndSendMessage();
 //    }
     @Scheduled(cron = "0 0 9 * * ?")
-    public void checkGreenChannel() {
+    public void checkPartnerAuthStatusAndSendMessage() {
-        synchronizedScheduler.executeProcess("manage_task:CheckPartnerAuthStatus", 120_000, () -> simpleClientService.checkGreenChannelClients());
+        synchronizedScheduler.executeProcess("manage_task:checkPartnerAuthStatusAndSendMessage", 120_000, () -> simpleClientService.checkGreenChannelClients());
 
     }
 }

src/main/java/au/com/royalpay/payment/manage/task/CustomerImpressionTask.java

@@ -34,8 +34,8 @@ public class CustomerImpressionTask {
     private ThreadPoolExecutor generatePool = new ThreadPoolExecutor(10, 30, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
     @Scheduled(cron = "0 30 3 * * ?")
-    public void generateTags() {
+    public void customerImpressionGenerateTags() {
-        synchronizedScheduler.executeProcess("manage_task:CustomerImpression", 120_000, () -> {
+        synchronizedScheduler.executeProcess("manage_task:customerImpressionGenerateTags", 120_000, () -> {
             List<JSONObject> clients = clientMapper.listValidClient();
             List<List<JSONObject>> splitList = new ArrayList<>();
             for (int i = 0; i < clients.size(); i += 200) {
@@ -57,7 +57,7 @@ public class CustomerImpressionTask {
     }
 
     @Scheduled(cron = "0/1 * * * * ?")
-    public void generateInfo() {
+    public void customerImpressionGenerateInfo() {
         synchronizedScheduler.executeProcess("manage_task:CustomerImpression", 1_000, () -> customerImpressionService.generateInfo());
     }
 }

src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java

@@ -26,8 +26,8 @@ public class DailyReportGenerationTask {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 0 10 * * ?")
-    public void autoGenerateReport() {
+    public void dailyReportAutoGenerateReport() {
-        synchronizedScheduler.executeProcess("manage_task:autoGenerateDailyReport", 120_000, () -> {
+        synchronizedScheduler.executeProcess("manage_task:dailyReportAutoGenerateReport", 120_000, () -> {
             Date yesterday = DateUtils.addDays(new Date(), -1);
             dailyReport.generateReport(DateFormatUtils.format(yesterday, "yyyy-MM-dd"), true);
         });

src/main/java/au/com/royalpay/payment/manage/task/DirectedBillCodeStatusDailyCheck.java

@@ -20,8 +20,8 @@ public class DirectedBillCodeStatusDailyCheck {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 30 5 * * ?")
-    public void statusDailyCheck() {
+    public void directedBillCodeStatusDailyCheck() {
-        synchronizedScheduler.executeProcess("manage_task:dailyCheckDirected", 120_000,
+        synchronizedScheduler.executeProcess("manage_task:directedBillCodeStatusDailyCheck", 120_000,
                 () -> partnerBillService.dailyCheckDirectedBillCode());
     }
 }

src/main/java/au/com/royalpay/payment/manage/task/OfeiOrderCheckTask.java

@@ -27,7 +27,7 @@ public class OfeiOrderCheckTask {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 0/20 * * * ?")
-    public void checkGreenChannel() {
+    public void ofeiOrderCheck() {
         synchronizedScheduler.executeProcess("manage_task:ofeiOrderCheck", 120_000, () -> {
             List<String> orderIds = topUpOrderMapper.findOrderIdByStatus("10");
             if (CollectionUtils.isEmpty(orderIds)) {

src/main/java/au/com/royalpay/payment/manage/task/PartnerInitEmailChecker.java

@@ -23,9 +23,9 @@ public class PartnerInitEmailChecker {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 0/5 * * * *")
-    public void checkEmailStatus() {
+    public void checkPartnerInitEmail() {
         if (PlatformEnvironment.getEnv().taskEnabled()) {
-            synchronizedScheduler.executeProcess("manage_task:emailStatusCheck", 120_000,
+            synchronizedScheduler.executeProcess("manage_task:checkPartnerInitEmail", 120_000,
                     () -> clientManager.checkEmailStatus());
         }
     }

src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java

@@ -24,8 +24,8 @@ public class PartnerTransactionsDailyMsgTaskManager {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 0 8 * * ?")
-    public void analysisDashboard() {
+    public void partnerTransactionsDailyMsg() {
-        synchronizedScheduler.executeProcess("manage_task:partnerDailyMsg", 120_000,
+        synchronizedScheduler.executeProcess("manage_task:partnerTransactionsDailyMsg", 120_000,
                 () -> customersAnalysisService.sendPartnerTransactionDaily(DateUtils.addDays(new Date(), -1)));
     }
 }

src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java

@@ -50,7 +50,7 @@ public class PostponeClientTask {
 
 
     @Scheduled(cron = "0 30 8 * * ?")
-    public void checkGreenChannel() {
+    public void postponeClient() {
         synchronizedScheduler.executeProcess("manage_task:postPoneClient", 120_000, () -> {
             Date now = new Date();
             Date tomorrow = DateUtils.addDays(now, 1);

src/main/java/au/com/royalpay/payment/manage/task/WeekReportGenerationTask.java

@@ -26,8 +26,8 @@ public class WeekReportGenerationTask {
     private SynchronizedScheduler synchronizedScheduler;
 
     @Scheduled(cron = "0 0 2 * * 1")
-    public void autoGenerateReport() {
+    public void weekReportGeneration() {
-        synchronizedScheduler.executeProcess("manage_task:genWeekReport", 120_000, () -> {
+        synchronizedScheduler.executeProcess("manage_task:weekReportGeneration", 120_000, () -> {
             Date lastweek = new Date();
             lastweek = DateUtils.addDays(lastweek, -7);
             weekReporter.generateReport(DateFormatUtils.format(lastweek, "yyyy-MM-dd"), true);