Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/custom/task/CustomQueryTask.java

@@ -24,15 +24,14 @@ public class CustomQueryTask {
     private PmtCustomReportMapper pmtCustomReportMapper;
 
     @Scheduled(cron = "0 0/10 * * * *")
-    public void customReportQuery(){
+    public void customReportQuery() {
         List<JSONObject> reports = pmtCustomReportMapper.findCustomReportNotScucess();
-        if(!reports.isEmpty()){
-            for (JSONObject report:reports) {
-                //Alipay直接返回成功与否，Wechat返回的结果较多，成功提交至海关后状态才会变为success，因此只有Wechat需要定时查询报关单状态
-                if(report.getString("channel").equals("Wechat")){
-                    customSupport.queryCustomResult(report.getString("report_id"));
-                }
+        reports.forEach(report -> {
+            try {
+                customSupport.queryCustomResult(report.getString("report_id"));
+            } catch (Exception e) {
+                //donothing
             }
-        }
+        });
     }
 }