From dc6f0757d74c63fcbc2743497cf6a18e758587b6 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 10 Dec 2025 12:42:06 +0800 Subject: [PATCH] =?UTF-8?q?12=E6=9C=8810=E6=97=A5=E9=93=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/serviceImpl/cash/BankServiceImpl.java | 39 +++++++++++++++++----- .../resources/cashMapper/CashCollectionMapper.xml | 4 +-- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java index fc558bc..a28aa72 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java @@ -160,8 +160,6 @@ public class BankServiceImpl implements BankService { } } - //payment银行接口(批量) - @Override public Result paymentAuto(BankDTO bankDTO) { try { // 1. 准备参数 @@ -203,6 +201,12 @@ public class BankServiceImpl implements BankService { JSONObject jsonObject = JSON.parseObject(responseBody); JSONArray transactions = jsonObject.getJSONObject("payload").getJSONArray("transactions"); + // 添加非空校验 + if (transactions == null || transactions.isEmpty()) { + log.warn("transactions为空或无数据"); + return Result.error("payment当天无数据请切换日期"); + } + // 创建BankVO并设置paymentDTOList BankVO bankVO = new BankVO(); List paymentDTOList; @@ -233,7 +237,7 @@ public class BankServiceImpl implements BankService { // 获取订单号 String orderNo = paymentDTO.getMerchant_reference(); - List orderNoList = cashCollectionMapper.selectStripeList(); + List orderNoList = cashCollectionMapper.selectPaymentList(); // 检查当前订单号是否在列表中 if (orderNoList.contains(orderNo)) { cashCollectionMapper.updateByGoldCoinOrderCodeByPayment(paymentDTO); @@ -266,6 +270,7 @@ public class BankServiceImpl implements BankService { } } + //stripe银行接口(批量) @Override public Result stripeAuto(BankDTO bankDTO) { @@ -718,7 +723,7 @@ public class BankServiceImpl implements BankService { } // 银行自动处理接口(每天早上6点执行) - @Scheduled(cron = "0 53 10 * * ?") + @Scheduled(cron = "0 0 6 * * ?") @Override public Result bankAuto() { try { @@ -742,14 +747,26 @@ public class BankServiceImpl implements BankService { String todayStr = today.format(formatter); // 创建BankDTO实例并设置时间 BankDTO dto = new BankDTO(); - dto.setStartTime(fiveDayAgoStr); dto.setEndTime(todayStr); - dto.setTime(sixDayAgoStr); + dto.setSum(1000); // 依次调用各个自动处理方法 - Result paymentResult = paymentAuto(dto); + dto.setTime(oneDayAgoStr); + Result paymentOneDayResult = paymentAuto(dto); + dto.setTime(twoDayAgoStr); + Result paymentTwoDayResult = paymentAuto(dto); + dto.setTime(threeDayAgoStr); + Result paymentThreeDayResult = paymentAuto(dto); + dto.setTime(fourDayAgoStr); + Result paymentFourDayResult = paymentAuto(dto); + dto.setTime(fiveDayAgoStr); + Result paymentFiveDayResult = paymentAuto(dto); + dto.setTime(sixDayAgoStr); + Result paymentSixDayResult = paymentAuto(dto); + dto.setTime(sevenDayAgoStr); + Result paymentSevenDayResult = paymentAuto(dto); Result stripeResult = stripeAuto(dto); Result firstdataResult = firstdataAuto(dto); Result ipayResult = ipayAuto(dto); @@ -759,7 +776,13 @@ public class BankServiceImpl implements BankService { List messages = new ArrayList<>(); // 收集各方法的处理结果信息 - messages.add("Payment Auto Result: " + (paymentResult != null ? paymentResult.toString() : "null")); + messages.add("Payment One Day Auto Result: " + (paymentOneDayResult != null ? paymentOneDayResult.toString() : "null")); + messages.add("Payment Two Day Auto Result: " + (paymentTwoDayResult != null ? paymentTwoDayResult.toString() : "null")); + messages.add("Payment Three Day Auto Result: " + (paymentThreeDayResult != null ? paymentThreeDayResult.toString() : "null")); + messages.add("Payment Four Day Auto Result: " + (paymentFourDayResult != null ? paymentFourDayResult.toString() : "null")); + messages.add("Payment Five Day Auto Result: " + (paymentFiveDayResult != null ? paymentFiveDayResult.toString() : "null")); + messages.add("Payment Six Day Auto Result: " + (paymentSixDayResult != null ? paymentSixDayResult.toString() : "null")); + messages.add("Payment Seven Day Auto Result: " + (paymentSevenDayResult != null ? paymentSevenDayResult.toString() : "null")); messages.add("Stripe Auto Result: " + (stripeResult != null ? stripeResult.toString() : "null")); messages.add("Firstdata Auto Result: " + (firstdataResult != null ? firstdataResult.toString() : "null")); messages.add("Ipay Auto Result: " + (ipayResult != null ? ipayResult.toString() : "null")); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 1259c0f..d36cfc4 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -309,13 +309,13 @@ select * from cash_record_collection where bank_code=#{bankCode}