Merge branch 'transaction-parameters' into Exception-Handling

aconnect/src/main/java/com/mfsys/aconnect/client/dto/AccountGLTransactionRequest.java

@@ -19,8 +19,15 @@ public class AccountGLTransactionRequest {
 
     @Data
     public static class AdditionalInfo {
+        private String sgtPtrtrancode;
+        private String sgtRelwithbnfowner;
         private Boolean sgtRemittancetrans;
+        private String sgtSenderBeneficiaryAccNo;
+        private String sgtSenderBeneficiaryAddress;
+        private String sgtSenderBeneficiaryName;
         private String sgtTrandate;
+        private String sgtTranreason;
+        private String sgtWalkingcustname;
     }
 
     @Data

aconnect/src/main/java/com/mfsys/aconnect/client/dto/AccountToAccountDTO.java

@@ -25,11 +25,19 @@ public class AccountToAccountDTO {
 
     @Data
     public static class AdditionalInfo {
+
         private String sgtBnfowner;
         private String sgtPrcRlcscodec;
         private String sgtPtrtrancode;
         private String sgtRelwithbnfowner;
         private String sgtTranreason;
+
+        private String sgtTranjust;
+        private String sgtVehiclenumber;
+        private String sgtReginfo;
+        private String sgtSaleplace;
+        private String sgtMfgyear;
+        private String sgtEstatevalue;
     }
 
     @Data

aconnect/src/main/java/com/mfsys/aconnect/client/dto/GLtoGLRequest.java

@@ -20,6 +20,17 @@ public class GLtoGLRequest {
     public static class AdditionalInfo {
         private Boolean sgtRemittancetrans;
         private String sgtTrandate;
+        private String sgtBnfowner;
+        private String sgtEstatevalue;
+        private String sgtPrcRlcscodec;
+        private String sgtPtrtrancode;
+        private String sgtReginfo;
+        private String sgtRelwithbnfowner;
+        private String sgtSaleplace;
+        private String sgtTranreason;
+        private String sgtVehiclenumber;
+        private String sgtWalkingcustname;
+        private String sgtWalkingcustnumber;
     }
 
     @Data

aconnect/src/main/java/com/mfsys/aconnect/client/dto/GlToAccountDTO.java

@@ -9,7 +9,8 @@ import java.util.Map;
 @Data
 public class GlToAccountDTO {
 
-    private Map<String, Object> additionalInfo;
+//    private AdditionalInfo additionalInfo;
+private Map<String, Object> additionalInfo;
 
     private DebitGl debitGl;
     private CreditAcc creditAcc;
@@ -47,4 +48,29 @@ public class GlToAccountDTO {
         private String pitInstcode;
         private String sgtGntrinstrumentno;
     }
+
+    @Data
+    public static class AdditionalInfo {
+
+        private String sgtBnfowner;
+        private String sgtWalkingcustname;
+        private String sgtPrcRlcscodec;
+        private String sgtWalkingcustnumber;
+
+        private String sgtTrandate;
+        private String sgtPtrtrancode;
+        private String sgtTranreason;
+        private String sgtRelwithbnfowner;
+        private Boolean sgtRemittancetrans;
+
+        private String sgtVehiclenumber;
+        private String sgtReginfo;
+        private String sgtSaleplace;
+        private String sgtMfgyear;
+        private String sgtEstatevalue;
+
+        private String sgtSenderBeneficiaryName;
+        private String sgtSenderBeneficiaryAddress;
+        private String sgtSenderBeneficiaryAccNo;
+    }
 }

aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java

@@ -173,8 +173,7 @@ public class TransactionService {
         }
 
         String porOrgacode  = accountToAccountDTO.getPorOrgacode();
-        String url = depositURI + "/deposit" + "/organizations/" + porOrgacode +  "/transactions" + ACONNECT + "/" +
-                "";
+        String url = depositURI + "/deposit" + "/organizations/" + porOrgacode +  "/transactions" + ACONNECT + "/account-to-account";
         HttpHeaders headers = new HttpHeaders();
         headers.set("Authorization", tokenHeader);
         headers.set("POR_ORGACODE", porOrgacode);