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

resolved the conflicts

Browse Source
This commit is contained in:
Lincpay Tech
2025-12-22 18:10:12 +05:30
parent 5d0f043848 a4842788c1
commit 6126bc1d81
11 changed files with 84 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/billpaymentservice/bbps/serviceImpl/ComplainServiceImpl.java
+1 -1
View File
@@ -197,7 +197,7 @@ public class ComplainServiceImpl implements ComplainService {
ComplaintResponse responseWrapper = objectMapper.convertValue(dataMap, ComplaintResponse.class);
String saveComplaintResponseEntity = mapperHelper.saveComplaintResponseEntity(responseWrapper, requestId,
txnId, userId, requestTxnId);
txnId, userId, requestTxnId, mid);
LOGGER.info("Save Complaint Response Count" + saveComplaintResponseEntity);
ResponseModel responseModel = new ResponseModel(responseWrapper.getMessage(), responseWrapper.getStatus(),
Integer.parseInt(responseWrapper.getStatusCode()), responseWrapper);
src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java
+1 -1
View File
@@ -402,7 +402,7 @@ public class PaymentStartServiceImpl implements PaymentStartService {
record.setSignature(signature);
record.setTxnStatus(txnStatus);
record.setCallbackReceivedOn(java.time.LocalDateTime.now().toString());
record.setCallbackReceivedOn(LocalDateTime.now().toString());
String merchantStatus;
if (!signatureMatches) {