From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java b/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java
index cd16b9b..657cfc2 100644
--- a/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java
+++ b/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java
@@ -64,9 +64,10 @@
*/
public CovertPayBackResult covertPayCallBack(HttpServletRequest httpRequest, Function<ChargeBillRequest,Boolean> consumer) {
CovertPayBackResult result = new CovertPayBackResult();
+ String requestContent = "";
try {
// 接收报文
- String requestContent = SignatureAndVerification.getRequestBody(httpRequest).trim();
+ requestContent = SignatureAndVerification.getRequestBody(httpRequest).trim();
String sign = requestContent.substring(0,
requestContent.indexOf("||"));;
String requestBody = requestContent.substring(sign
@@ -95,13 +96,21 @@
}
result.setResult(chargeBillRequest);
result.setBack(createResponse(chargeBillRequest,dealBack));
+ }catch (ServiceException e){
+ result.setBack(e.getMessage());
+ throw e;
}catch (Exception e){
- log.error("解析报文发生异常",e);
+ log.error("解析异常：{}",requestContent,e);
+ throw new ServiceException("支付回调解析异常");
}
return result;
}
+ public void covertBillTo(){
+
+
+ }
--
Gitblit v1.7.1