From 4b261fc96dfaf95f2829ece62c59e3dd810c37eb Mon Sep 17 00:00:00 2001
From: esinev <es@payneteasy.com>
Date: Thu, 6 Jul 2023 02:05:53 +0300
Subject: [PATCH] Removed RRN additional logic

---
 .../com/payneteasy/pos/proxy/impl/PaymentServiceImpl.java     | 4 ++--
 .../com/payneteasy/pos/proxy/messages/PaymentResponse.java    | 2 +-
 .../java/com/payneteasy/pos/proxy/messages/RefundRequest.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/payneteasy/pos/proxy/impl/PaymentServiceImpl.java b/server/src/main/java/com/payneteasy/pos/proxy/impl/PaymentServiceImpl.java
index 7d879ed..55fd0a9 100644
--- a/server/src/main/java/com/payneteasy/pos/proxy/impl/PaymentServiceImpl.java
+++ b/server/src/main/java/com/payneteasy/pos/proxy/impl/PaymentServiceImpl.java
@@ -27,7 +27,7 @@ public PaymentResponse pay(PaymentRequest aRequest) {
             return PaymentResponse.builder()
                     .amount       ( saResponse.get_00_amount().toString()     )
                     .currency     ( aRequest.getCurrency()                    )
-                    .orderId      ( getPaynetOrderId(saResponse)              )
+                    .orderId      ( saResponse.get_14_rrn()                   )
                     .responseCode ( saResponse.get_15_responseCode()          )
                     .build();
         });
@@ -41,7 +41,7 @@ public PaymentResponse refund(RefundRequest aRequest) {
             Sa29ReversalResponse saResponse = aClient.makeReversal(
                     aRequest.getCurrency()
                     , new BigDecimal(aRequest.getRefundAmount())
-                    , toRrn(aRequest.getOrderId())
+                    , aRequest.getOrderId()
                     , aRequest.getTerminalId()
             );
 
diff --git a/server/src/main/java/com/payneteasy/pos/proxy/messages/PaymentResponse.java b/server/src/main/java/com/payneteasy/pos/proxy/messages/PaymentResponse.java
index 27b886d..8a175a2 100644
--- a/server/src/main/java/com/payneteasy/pos/proxy/messages/PaymentResponse.java
+++ b/server/src/main/java/com/payneteasy/pos/proxy/messages/PaymentResponse.java
@@ -18,6 +18,6 @@ public class PaymentResponse {
     @NonNull
     private final String responseCode;
 
-    private final Long orderId;
+    private final String orderId;
 
 }
diff --git a/server/src/main/java/com/payneteasy/pos/proxy/messages/RefundRequest.java b/server/src/main/java/com/payneteasy/pos/proxy/messages/RefundRequest.java
index ed2d0ca..99c1ad1 100644
--- a/server/src/main/java/com/payneteasy/pos/proxy/messages/RefundRequest.java
+++ b/server/src/main/java/com/payneteasy/pos/proxy/messages/RefundRequest.java
@@ -12,7 +12,7 @@ public class RefundRequest {
     /**
      * Paynet order id to refund
      */
-    private final long orderId;
+    private final String orderId;
 
     @NonNull
     private final String currency;