|
|
|
@@ -720,9 +720,7 @@ public class BillerMapperHelper {
|
|
|
|
|
parent.setUserId(responseWrapper.getUserId());
|
|
|
|
|
// Map incoming DTO date strings into Auditable LocalDateTime fields
|
|
|
|
|
LocalDateTime parentCreatedOn = parseToLocalDateTime(responseWrapper.getCreationDate());
|
|
|
|
|
if (parentCreatedOn != null) parent.setCreatedOn(parentCreatedOn);
|
|
|
|
|
LocalDateTime parentUpdatedOn = parseToLocalDateTime(responseWrapper.getModifiedDate());
|
|
|
|
|
if (parentUpdatedOn != null) parent.setUpdatedOn(parentUpdatedOn);
|
|
|
|
|
parent.setCreatedEpochDate(responseWrapper.getCreatedEpochDate());
|
|
|
|
|
parent.setModifiedEpochDate(responseWrapper.getModifiedEpochDate());
|
|
|
|
|
parent.setReqId(reqId);
|
|
|
|
@@ -965,12 +963,10 @@ public class BillerMapperHelper {
|
|
|
|
|
// DATES
|
|
|
|
|
// Map incoming DTO date strings into Auditable LocalDateTime fields
|
|
|
|
|
LocalDateTime bmCreatedOn = parseToLocalDateTime(responseWrapper.getCreationDate());
|
|
|
|
|
if (bmCreatedOn != null) {
|
|
|
|
|
billMaster.setCreatedOn(bmCreatedOn);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
LocalDateTime bmUpdatedOn = parseToLocalDateTime(responseWrapper.getModifiedDate());
|
|
|
|
|
if (bmUpdatedOn != null) {
|
|
|
|
|
billMaster.setUpdatedOn(bmUpdatedOn);
|
|
|
|
|
billMaster.setUpdatedDateTime(bmUpdatedOn);
|
|
|
|
|
}
|
|
|
|
|
billMaster.setCreatedEpochDate(responseWrapper.getCreatedEpochDate());
|
|
|
|
|
billMaster.setModifiedEpochDate(responseWrapper.getModifiedEpochDate());
|
|
|
|
@@ -1099,15 +1095,12 @@ public class BillerMapperHelper {
|
|
|
|
|
record.setQrString(Optional.ofNullable(apiResponse.getResponseData().getQrString()).orElse("NO_QR"));
|
|
|
|
|
// parse createdOn string into LocalDateTime and set on Auditable
|
|
|
|
|
LocalDateTime createdOn = parseToLocalDateTime(apiResponse.getResponseData().getCreatedOn());
|
|
|
|
|
if (createdOn == null) createdOn = LocalDateTime.now();
|
|
|
|
|
record.setCreatedOn(createdOn);
|
|
|
|
|
// default status pending
|
|
|
|
|
|
|
|
|
|
record.setTxnStatus("PENDING");
|
|
|
|
|
} else {
|
|
|
|
|
record.setAmount("0.00");
|
|
|
|
|
record.setMid(request.getMid());
|
|
|
|
|
record.setTxnStatus("PENDING");
|
|
|
|
|
record.setCreatedOn(LocalDateTime.now());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// store the original request body and raw response
|
|
|
|
|