diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/PaymentUpdateBySdf04.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/PaymentUpdateBySdf04.java index a3e7e5a51..2f3e9afe8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/PaymentUpdateBySdf04.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/PaymentUpdateBySdf04.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.service; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -36,7 +37,7 @@ public class PaymentUpdateBySdf04 { continue; } PaymentInstruction payment = paymentImdgs.getFirstObjectByFieldValues(Map.of("id", paymentId)); - if ("OK!".equals(sDf04.getImp_result())) { + if (StringUtils.startsWith(sDf04.getImp_result(), "OK")) { payment.setTransactionStatus(TransactionStatus.ok.getKey()); } else { payment.setTransactionStatus(TransactionStatus.fail.getKey()); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java index 38ebb5ed9..75d49fb24 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java @@ -1,5 +1,6 @@ package ru.spcex.clearing.service.executors; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -70,7 +71,7 @@ public class Sdf04Executor extends AbstractExecutor { public Result execute(Collection sdf, StatementRequest statementRequest) { Result result = new Result(); for (SDf04 sdf04 : sdf) { - if (!("OK!".equals(sdf04.getImp_result()))) { + if (!StringUtils.startsWith(sdf04.getImp_result(), "OK")) { log.warn("groupId={} stop execute, cause: sdf04[{}].Imp_result=\"{}\" was not ok.", statementRequest.getGroupId(), sdf04.getId(), sdf04.getImp_result()); result.setAnyHasError(true); diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/PaymentUpdateBySdf04Test.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/PaymentUpdateBySdf04Test.java index 4fae28b35..018ebd19b 100644 --- a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/PaymentUpdateBySdf04Test.java +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/PaymentUpdateBySdf04Test.java @@ -58,7 +58,7 @@ class PaymentUpdateBySdf04Test extends AbstractClearingTest { SDf04 sDf04s = new SDf04(); sDf04s.setGenerationId(sdf04GroupId); sDf04s.setDocnm_ref(docnm_ref); - sDf04s.setImp_result("OK!"); + sDf04s.setImp_result("OK"); sdf04Imdg.insert(sDf04s); PaymentInstruction payment = new PaymentInstruction();