diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java index 471f5004..4cbaf90e 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java @@ -175,7 +175,7 @@ public class HcsContractSyncSupport { HcsResult result = hcsClient.getRelativeRisk(param); if (result == null || !result.isSuccess()) { log.error("HCS客商风险查询失败响应:{},contractNo={},standing={},fdNumber={}", - result == null ? "无响应" : result.getMsg(), contractManage.getContractNo(), standing, customerCode); + result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), contractManage.getContractNo(), standing, customerCode); throw new HcsException("C101-1 客商风险查询失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsRiskVO risk = result.getData(); @@ -199,7 +199,7 @@ public class HcsContractSyncSupport { query.setPageSize(10); HcsResult> result = hcsClient.contractList(query); if (result == null || !result.isSuccess()) { - log.error("HCS合同判重查询失败响应:{},contractNo={}", result == null ? "无响应" : result.getMsg(), contractManage.getContractNo()); + log.error("HCS合同判重查询失败响应:{},contractNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), contractManage.getContractNo()); throw new HcsException("C103-3 合同判重查询失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsPageVO page = result.getData(); @@ -227,7 +227,7 @@ public class HcsContractSyncSupport { log.info("HCS合同推送开始:{}(C103-11 更新,§9-U5 定位方式待联调)", contractManage.getContractNo()); HcsResult result = hcsClient.contractUpdate(param); if (result == null || !result.isSuccess()) { - log.error("HCS合同更新失败响应:{},contractNo={}", result == null ? "无响应" : result.getMsg(), contractManage.getContractNo()); + log.error("HCS合同更新失败响应:{},contractNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), contractManage.getContractNo()); throw new HcsException("C103-11 合同更新失败:" + (result == null ? "响应为空" : result.getMsg())); } } @@ -344,7 +344,7 @@ public class HcsContractSyncSupport { */ private String validateDraftResult(ContractManage contractManage, HcsResult result) { if (result == null || !result.isSuccess() || result.getData() == null || StringUtil.isBlank(result.getData().getFdContractId())) { - log.error("HCS合同发起失败响应:{},contractNo={}", result == null ? "无响应" : result.getMsg(), contractManage.getContractNo()); + log.error("HCS合同发起失败响应:{},contractNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), contractManage.getContractNo()); throw new HcsException("C103-1 合同发起失败:" + (result == null ? "响应为空" : result.getMsg())); } return result.getData().getFdContractId(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsCreditCheckSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsCreditCheckSupport.java index 42605ab7..34c9be20 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsCreditCheckSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsCreditCheckSupport.java @@ -111,7 +111,7 @@ public class HcsCreditCheckSupport { HcsResult result = hcsClient.getRelativeRisk(param); if (result == null || !result.isSuccess()) { log.error("HCS客商风险查询失败响应:{},paymentNo={},fdNumber={}", - result == null ? "无响应" : result.getMsg(), payment.getPaymentNo(), customerCode); + result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), payment.getPaymentNo(), customerCode); throw new HcsException("C101-1 客商风险查询失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsRiskVO risk = result.getData(); @@ -146,7 +146,7 @@ public class HcsCreditCheckSupport { param.setFdApplyAmount(payment.getAppliedAmount() == null ? BigDecimal.ZERO : payment.getAppliedAmount()); HcsResult result = hcsClient.contractCreditCheck(param); if (result == null || !result.isSuccess()) { - log.error("HCS额度校验失败响应:{},paymentNo={}", result == null ? "无响应" : result.getMsg(), payment.getPaymentNo()); + log.error("HCS额度校验失败响应:{},paymentNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), payment.getPaymentNo()); throw new HcsException("C106-1 额度校验失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsCreditCheckVO credit = result.getData(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsExeStageSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsExeStageSyncSupport.java index 301c385c..9c1cbf6e 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsExeStageSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsExeStageSyncSupport.java @@ -99,7 +99,7 @@ public class HcsExeStageSyncSupport { param.getFdEopExeplanOperateType(), pendingRows.size()); HcsResult result = hcsClient.exeplanAdd(param); if (result == null || !result.isSuccess() || result.getData() == null) { - log.error("HCS履约规则同步失败响应:{},contractNo={}", result == null ? "无响应" : result.getMsg(), contractManage.getContractNo()); + log.error("HCS履约规则同步失败响应:{},contractNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), contractManage.getContractNo()); throw new HcsException("C103-9 履约规则同步失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsExeplanVO exeplan = result.getData(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsInvoiceRegSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsInvoiceRegSyncSupport.java index f4ca4d03..b130a851 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsInvoiceRegSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsInvoiceRegSyncSupport.java @@ -179,7 +179,7 @@ public class HcsInvoiceRegSyncSupport { log.info("HCS开票登记新增开始:applicationNo={}", application.getApplicationNo()); HcsResult result = hcsClient.invoiceRegistrationAdd(param); if (result == null || !result.isSuccess() || result.getData() == null || StringUtil.isBlank(result.getData().getFdId())) { - log.error("HCS开票登记新增失败响应:{},applicationNo={}", result == null ? "无响应" : result.getMsg(), application.getApplicationNo()); + log.error("HCS开票登记新增失败响应:{},applicationNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), application.getApplicationNo()); throw new HcsException("C111-2 开票登记新增失败:" + (result == null ? "响应为空" : result.getMsg())); } return result.getData().getFdId(); @@ -199,7 +199,7 @@ public class HcsInvoiceRegSyncSupport { log.info("HCS开票登记更新开始:applicationNo={},fdId={}", application.getApplicationNo(), application.getHcsFdId()); HcsResult result = hcsClient.invoiceRegistrationUpdate(param); if (result == null || !result.isSuccess()) { - log.error("HCS开票登记更新失败响应:{},applicationNo={}", result == null ? "无响应" : result.getMsg(), application.getApplicationNo()); + log.error("HCS开票登记更新失败响应:{},applicationNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), application.getApplicationNo()); throw new HcsException("C111-3 开票登记更新失败:" + (result == null ? "响应为空" : result.getMsg())); } return "C111-3 开票登记更新成功"; @@ -217,7 +217,7 @@ public class HcsInvoiceRegSyncSupport { query.setPageSize(10); HcsResult> result = hcsClient.invoiceRegistrationList(query); if (result == null || !result.isSuccess()) { - log.error("HCS开票登记判重查询失败响应:{},applicationNo={}", result == null ? "无响应" : result.getMsg(), application.getApplicationNo()); + log.error("HCS开票登记判重查询失败响应:{},applicationNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), application.getApplicationNo()); throw new HcsException("C111-1 开票登记判重查询失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsPageVO page = result.getData(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPerfRecordSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPerfRecordSyncSupport.java index 1019a314..0ed6a3b1 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPerfRecordSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPerfRecordSyncSupport.java @@ -94,7 +94,7 @@ public class HcsPerfRecordSyncSupport { log.info("HCS履约记录新建开始:paymentNo={}", payment.getPaymentNo()); HcsResult result = hcsClient.perfRecordAdd(param); if (result == null || !result.isSuccess() || result.getData() == null || StringUtil.isBlank(result.getData().getFdId())) { - log.error("HCS履约记录新建失败响应:{},paymentNo={}", result == null ? "无响应" : result.getMsg(), payment.getPaymentNo()); + log.error("HCS履约记录新建失败响应:{},paymentNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), payment.getPaymentNo()); throw new HcsException("C108-1 履约记录新建失败:" + (result == null ? "响应为空" : result.getMsg())); } // 履约记录ID 立即持久化(调用方必须保存) @@ -108,7 +108,7 @@ public class HcsPerfRecordSyncSupport { log.info("HCS履约记录更新开始:paymentNo={},perfFdId={}", payment.getPaymentNo(), payment.getHcsPerfFdId()); HcsResult result = hcsClient.perfRecordUpdate(param); if (result == null || !result.isSuccess()) { - log.error("HCS履约记录更新失败响应:{},paymentNo={}", result == null ? "无响应" : result.getMsg(), payment.getPaymentNo()); + log.error("HCS履约记录更新失败响应:{},paymentNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), payment.getPaymentNo()); throw new HcsException("C108-2 履约记录更新失败:" + (result == null ? "响应为空" : result.getMsg())); } return "C108-2 履约记录更新成功"; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java index 52aefe9e..df3e7b80 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java @@ -131,7 +131,7 @@ public class HcsProjectSyncSupport { log.info("HCS项目立项推送开始:{}(C102-1 新建)", projectApply.getProjectCode()); HcsResult result = hcsClient.projectAdd(param); if (result == null || !result.isSuccess() || result.getData() == null || StringUtil.isBlank(result.getData().getFdId())) { - log.error("HCS项目立项新建失败响应:{},projectCode={}", result == null ? "无响应" : result.getMsg(), projectApply.getProjectCode()); + log.error("HCS项目立项新建失败响应:{},projectCode={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), projectApply.getProjectCode()); throw new HcsException("C102-1 项目立项新建失败:" + (result == null ? "响应为空" : result.getMsg())); } return result.getData().getFdId(); @@ -153,7 +153,7 @@ public class HcsProjectSyncSupport { log.info("HCS项目立项推送开始:{}(C102-2 更新)", projectApply.getProjectCode()); HcsResult result = hcsClient.projectUpdate(param); if (result == null || !result.isSuccess()) { - log.error("HCS项目立项更新失败响应:{},projectCode={}", result == null ? "无响应" : result.getMsg(), projectApply.getProjectCode()); + log.error("HCS项目立项更新失败响应:{},projectCode={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), projectApply.getProjectCode()); throw new HcsException("C102-2 项目立项更新失败:" + (result == null ? "响应为空" : result.getMsg())); } } @@ -225,7 +225,7 @@ public class HcsProjectSyncSupport { query.setCurUser(HcsUserRefVO.ofLoginName(requireLoginName(projectApply, "C102-3"))); HcsResult> result = hcsClient.projectList(query); if (result == null || !result.isSuccess()) { - log.error("HCS项目立项判重查询失败响应:{},projectCode={}", result == null ? "无响应" : result.getMsg(), projectApply.getProjectCode()); + log.error("HCS项目立项判重查询失败响应:{},projectCode={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), projectApply.getProjectCode()); throw new HcsException("C102-3 项目立项判重查询失败:" + (result == null ? "响应为空" : result.getMsg())); } HcsPageVO page = result.getData(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsReceiptBillSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsReceiptBillSyncSupport.java index e070a97e..143d94e8 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsReceiptBillSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsReceiptBillSyncSupport.java @@ -118,7 +118,7 @@ public class HcsReceiptBillSyncSupport { log.info("HCS收票单更新开始:invoiceNo={},fdId={}", invoiceReceipt.getInvoiceNo(), invoiceReceipt.getHcsFdId()); HcsResult> result = hcsClient.updateReceiveBill(param); if (result == null || !result.isSuccess()) { - log.error("HCS收票单更新失败响应:{},invoiceNo={}", result == null ? "无响应" : result.getMsg(), invoiceReceipt.getInvoiceNo()); + log.error("HCS收票单更新失败响应:{},invoiceNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), invoiceReceipt.getInvoiceNo()); throw new HcsException("C109-2 收票单更新失败:" + (result == null ? "响应为空" : result.getMsg())); } return "C109-2 收票单更新成功"; @@ -211,7 +211,7 @@ public class HcsReceiptBillSyncSupport { private String extractNestedFdId(InvoiceReceipt invoiceReceipt, HcsResult> result) { if (result == null || !result.isSuccess() || result.getData() == null || !result.getData().isSuccess() || result.getData().getData() == null || StringUtil.isBlank(result.getData().getData().getFdId())) { - log.error("HCS收票单新建失败响应:{},invoiceNo={}", result == null ? "无响应" : result.getMsg(), invoiceReceipt.getInvoiceNo()); + log.error("HCS收票单新建失败响应:{},invoiceNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), invoiceReceipt.getInvoiceNo()); throw new HcsException("C109-1 收票单新建失败:" + (result == null ? "响应为空" : result.getMsg())); } return result.getData().getData().getFdId(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsSpecPaySyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsSpecPaySyncSupport.java index 990490e6..98370a1d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsSpecPaySyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsSpecPaySyncSupport.java @@ -101,7 +101,7 @@ public class HcsSpecPaySyncSupport { log.info("HCS结算付款特批更新开始:paymentNo={},specFdId={}", payment.getPaymentNo(), payment.getHcsSpecFdId()); HcsResult> result = hcsClient.updateSpecApplyPay(param); if (result == null || !result.isSuccess()) { - log.error("HCS结算付款特批更新失败响应:{},paymentNo={}", result == null ? "无响应" : result.getMsg(), payment.getPaymentNo()); + log.error("HCS结算付款特批更新失败响应:{},paymentNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), payment.getPaymentNo()); throw new HcsException("C106-4 特批更新失败:" + (result == null ? "响应为空" : result.getMsg())); } return "C106-4 特批更新成功"; @@ -197,7 +197,7 @@ public class HcsSpecPaySyncSupport { private String extractNestedFdId(PaymentApplication payment, HcsResult> result) { if (result == null || !result.isSuccess() || result.getData() == null || !result.getData().isSuccess() || result.getData().getData() == null || StringUtil.isBlank(result.getData().getData().getFdId())) { - log.error("HCS结算付款特批发起失败响应:{},paymentNo={}", result == null ? "无响应" : result.getMsg(), payment.getPaymentNo()); + log.error("HCS结算付款特批发起失败响应:{},paymentNo={}", result == null ? "无响应" : String.format("msg=%s, traceId=%s", result.getMsg(), result.getTraceId()), payment.getPaymentNo()); throw new HcsException("C106-3 特批发起失败:" + (result == null ? "响应为空" : result.getMsg())); } return result.getData().getData().getFdId();