diff --git a/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java b/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java index 5a87b3b..bdb5a8d 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java +++ b/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java @@ -32,7 +32,7 @@ public class BillPaymentRequest extends BaseClass { private String customerMobNo; - private String txnAmount; // Changed to @NotNull as it's an Integer (non-nullable) + private Integer txnAmount; // Changed to @NotNull as it's an Integer (non-nullable) private String paymentRefId; diff --git a/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java b/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java index e5df46c..047432e 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java +++ b/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java @@ -29,7 +29,7 @@ public class BillPaymentForwardRequest { private String billerCategory; private String macAdress; private String customerMobNo; - private String txnAmount; + private Integer txnAmount; private String paymentRefId; private String clientReqId; private String paymentChannel; diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java index a6fbb43..d195103 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java @@ -138,9 +138,15 @@ public class PaymentServiceImpl implements PaymentService { LOGGER.warn("Invalid response structure received for txnId={}", txnId); throw new CustomException(BBPSConstant.INVALID_STRUCTURE); } - BillPaymentResponse billPaymentResponse = objectMapper.convertValue(dataMap, BillPaymentResponse.class); + GeneralResp generalResponse = billPaymentResponse.getGenericResponse(); + LOGGER.info("genric Response" + generalResponse); + if(generalResponse.getStatus().equalsIgnoreCase("Failed")) { + throw new CustomException(generalResponse.getMessage(), generalResponse.getStatus(), + Integer.parseInt(generalResponse.getStatusCode()), generalResponse.getRemarks()); + } + BillPayment entity = modelMapper.map(billPaymentResponse, BillPayment.class); paymentRepository.save(entity); diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java index 164d4e5..d36004d 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java @@ -303,7 +303,7 @@ public class PaymentStartServiceImpl implements PaymentStartService { rd.setAmount(parsedAmount != null && !parsedAmount.isEmpty() ? parsedAmount : "0.00"); rd.setMid(parsedMid); rd.setOrderNo(orderNo); - rd.setQrString("NO_QR"); + rd.setQrString("HTML_RESPONSE"); rd.setCreatedOn(LocalDateTime.now().toString()); apiResp.setResponseData(rd);