Merge branch 'develop'

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);
 }

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<Date> dateList = TimeZoneUtils.getStatetime();
             for (Date dateStr : dateList) {
@@ -154,7 +161,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
 
     }
 
-    public void generateAlipayOnlineSettleLogs() {
+    private void generateAlipayOnlineSettleLogs() {
         try {
             List<Date> dateList = TimeZoneUtils.getStatetime();
             for (Date dateStr : dateList) {

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());
     }
 }

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