Globots/bbps-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated entity and removed mid from paymentstartRecord

Browse Source
This commit is contained in:
Lincpay Tech
2025-12-16 16:50:48 +05:30
parent f9ba70414b
commit 0e747ed2a7
6 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/billpaymentservice/bbps/controller/PaymentController.java
-1
View File
@@ -46,7 +46,6 @@ public class PaymentController {
@ApiDocCommonResponses
public ResponseEntity<ResponseModel> requestBillFetch(
@RequestBody BillPaymentRequest billPaymentRequest) {
ResponseModel response = paymentService.initiatePayment(billPaymentRequest);
return ResponseEntity.ok(response);
}
src/main/java/com/billpaymentservice/bbps/dto/TransactionDTO.java
+8 -5
View File
@@ -66,9 +66,12 @@ public class TransactionDTO {
private String planType;
// ✅ Date fields as String (for JSON compatibility)
private String creationDate;
private String modifiedDate;
private Long createdEpochDate;
private Long modifiedEpochDate;
@JsonProperty("creationDate")
private String creationDateBank;
@JsonProperty("modifiedDate")
private String modifiedDateBank;
@JsonProperty("createdEpochDate")
private Long createdEpochDateBank;
@JsonProperty("modifiedEpochDate")
private Long modifiedEpochDateBank;
}
src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java
-3
View File
@@ -47,9 +47,6 @@ public class PaymentStartRecord extends Auditable {
@Column(name = "amount", nullable = false)
private String amount;
@Column(name = "mid", nullable = false)
private String mid;
@Column(name = "txn_id", unique = true, nullable = false)
private String txnId;
src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java
+8 -8
View File
@@ -164,15 +164,15 @@ public class TransactionMaster extends Auditable {
@Column(name = "plan_type")
private String planType;
@Column(name = "creation_date")
private String creationDate;
@Column(name = "creation_date_bank")
private String creationDateBank;
@Column(name = "modified_date")
private String modifiedDate;
@Column(name = "modified_date_bank")
private String modifiedDateBank;
@Column(name = "created_epoch_date")
private Long createdEpochDate;
@Column(name = "created_epoch_date_bank")
private Long createdEpochDateBank;
@Column(name = "modified_epoch_date")
private Long modifiedEpochDate;
@Column(name = "modified_epoch_date_bank")
private Long modifiedEpochDateBank;
}
src/main/java/com/billpaymentservice/bbps/serviceImpl/ComplainServiceImpl.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class ComplainServiceImpl implements ComplainService {
TransactionMaster transData = dataById.get();
// Inject tenantId + agentId into request JSON
String transactionCreatedDateString = transData.getCreationDate();
String transactionCreatedDateString = transData.getCreationDateBank();
LOGGER.info("Date is coming -:" + transactionCreatedDateString);
LOGGER.info("Return Date Time After 24 Hours"
+ BillerMapperHelper.isComplaintAllowed(transactionCreatedDateString));
src/main/java/com/billpaymentservice/bbps/util/BillerMapperHelper.java
+19 -19
View File
@@ -1037,9 +1037,9 @@ public class BillerMapperHelper {
dto.setPaymentInformation(transactionMaster.getPaymentInformation());
dto.setPlanId(transactionMaster.getPlanId());
dto.setPlanType(transactionMaster.getPlanType());
dto.setCreationDate(transactionMaster.getCreationDate());
dto.setModifiedDate(transactionMaster.getModifiedDate());
dto.setCreatedEpochDate(transactionMaster.getCreatedEpochDate());
dto.setCreationDate(transactionMaster.getCreationDateBank());
dto.setModifiedDate(transactionMaster.getModifiedDateBank());
dto.setCreatedEpochDate(transactionMaster.getCreatedEpochDateBank());
dto.setModifiedEpochDate(transactionMaster.getModifiedEpochDate());
return dto;
}
@@ -1052,7 +1052,7 @@ public class BillerMapperHelper {
TransactionHistoryParticularDetailsDTO dto = new TransactionHistoryParticularDetailsDTO();
dto.setBankTxnId(transactionMaster.getBankTxnId());
dto.setTxnId(transactionMaster.getTxnId());
dto.setCreationDate(transactionMaster.getCreationDate());
dto.setCreationDate(transactionMaster.getCreationDateBank());
dto.setBillerCategory(transactionMaster.getBillerCategory());
dto.setBillerName(transactionMaster.getBillerName());
dto.setStatus(transactionMaster.getStatus());
@@ -1095,21 +1095,21 @@ public class BillerMapperHelper {
record.setClientUserId(request.getClientUserId());
record.setInternalTxnId(txnId);
if (apiResponse != null && apiResponse.getResponseData() != null) {
record.setAmount(Optional.ofNullable(apiResponse.getResponseData().getAmount()).orElse("0.00"));
record.setMid(Optional.ofNullable(apiResponse.getResponseData().getMid()).orElse("DUMMY_MID"));
record.setTxnId(Optional.ofNullable(apiResponse.getResponseData().getTxnId()).orElse("DUMMY_TXN"));
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());
record.setTxnStatus("PENDING");
} else {
record.setAmount("0.00");
record.setMid(request.getMid());
record.setTxnStatus("PENDING");
}
if (apiResponse != null &&
apiResponse.getResponseData() != null) {
record.setAmount(Optional.ofNullable(apiResponse.getResponseData().getAmount(
)).orElse("0.00"));
record.setTxnId(Optional.ofNullable(apiResponse.getResponseData().getTxnId())
.orElse("DUMMY_TXN"));
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());
record.setTxnStatus("PENDING"); } else { record.setAmount("0.00");
record.setTxnStatus("PENDING"); }
// store the original request body and raw response
record.setRequestBody(requestJson);
record.setResponseBody(rawResponse);