diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java index a6444e4af..21049cd1f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java @@ -14,5 +14,7 @@ public interface PlatformClearService { void generateSettleLogs(); + void generateAliPaySettleLogs(); + void doVerifyHFSettleLog(JSONObject param); } diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java index 9e9064a3e..83a03f191 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java @@ -127,6 +127,13 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService { generateAlipayOnlineSettleLogs(); } + @Override + @Transactional + public void generateAliPaySettleLogs() { + generateAlipaySettleLogs(); + generateAlipayOnlineSettleLogs(); + } + @Transactional public void generateWechatSettleLogs() { try { @@ -138,7 +145,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService { } } - public void generateAlipaySettleLogs() { + private void generateAlipaySettleLogs() { try { List dateList = TimeZoneUtils.getStatetime(); for (Date dateStr : dateList) { @@ -154,7 +161,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService { } - public void generateAlipayOnlineSettleLogs() { + private void generateAlipayOnlineSettleLogs() { try { List dateList = TimeZoneUtils.getStatetime(); for (Date dateStr : dateList) { diff --git a/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java b/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java index d7d38327a..d1b69b508 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java @@ -42,6 +42,6 @@ public class SettleEstimateTaskManger { @Scheduled(cron = "0 0 10 * * ?") public void generateSettleLogs2() { - synchronizedScheduler.executeProcess("manage_task:genSettleLogappli2", 120_000, () -> platformClearService.generateSettleLogs()); + synchronizedScheduler.executeProcess("manage_task:generateAliPaySettleLog", 120_000, () -> platformClearService.generateAliPaySettleLogs()); } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml index c65eaf3dc..98529f116 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml @@ -18,7 +18,7 @@ FROM pmt_transactions WHERE - channel = #{channel} + order_channel = #{channel} AND transaction_type = #{transaction_type} AND transaction_time >= #{start_date} AND #{end_date} > transaction_time @@ -33,7 +33,7 @@ ELSE 0 END), 0.00) ali_charge_amount FROM pmt_transactions - WHERE channel = #{channel} + WHERE order_channel = #{channel} AND transaction_time >= #{start_date} AND #{end_date} > transaction_time AND system_generate = 0 @@ -47,7 +47,7 @@ FROM pmt_transactions WHERE - channel = #{channel} + order_channel = #{channel} AND transaction_type = #{transaction_type} AND transaction_time >= #{start_date} AND #{end_date} > transaction_time