Skip to content

B
business-java
Commit 64dcce74 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 source code commit 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106428 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3e9777fa
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 11 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 64dcce74
......@@ -215,7 +215,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
StringBuffer valueXmlString = new StringBuffer();
int currentFormNo = 0;
String sql = "", siteCode = "", siteDescr = "", gstinNo = "", userName = "", stateCode = "", stateDescr = "", grossTurnover = "", periodCode = "", currentYearGrossTurnover = "";
String tokenStr = "", authTokenDB = "", sekDB = "";
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
......@@ -518,16 +517,27 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if("SUBMIT".equalsIgnoreCase(action))
{
summaryDataJsonStr += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0)
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0 && summaryDataJsonStr.indexOf("Message :") == -1)
{
retXML += "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
}
else if(summaryDataJsonStr.indexOf("Message :") >= 0)
{
retXML += summaryDataJsonStr;
}
retXML += downloadGstr1Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK);
}
else if("FILE".equalsIgnoreCase(action))
{
summaryDataJsonStr += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
retXML = "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0 && summaryDataJsonStr.indexOf("Message :") == -1)
{
retXML += "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
}
else if(summaryDataJsonStr.indexOf("Message :") >= 0)
{
retXML += summaryDataJsonStr;
}
}
else if("GETINV".equalsIgnoreCase(action))
{
......@@ -539,16 +549,27 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if("SUBMIT".equalsIgnoreCase(action))
{
summaryDataJsonStr += getGstr2Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0)
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0 && summaryDataJsonStr.indexOf("Message :") == -1)
{
retXML += "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
}
else if(summaryDataJsonStr.indexOf("Message :") >= 0)
{
retXML += summaryDataJsonStr;
}
retXML += downloadGstr2Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK);
}
else if("FILE".equalsIgnoreCase(action))
{
summaryDataJsonStr += getGstr2Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
retXML = "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0 && summaryDataJsonStr.indexOf("Message :") == -1)
{
retXML += "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
}
else if(summaryDataJsonStr.indexOf("Message :") >= 0)
{
retXML += summaryDataJsonStr;
}
}
else if("GETINV".equalsIgnoreCase(action))
{
......@@ -597,6 +618,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
se.printStackTrace();
}
}
System.out.println("final return xml string["+valueXmlString.toString()+"]");
return valueXmlString.toString();
}
......@@ -1844,7 +1866,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
JSONObject errorJSON = getGstr1SumryResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn);
//retString = getError(errMsg, "GSTAPIERR", conn);
retString = errMsg;
}
}
else if(getGstr1SumryResp.getStatus() == 500)
......@@ -1852,7 +1875,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getGstr1SumryResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
//retString = getError(errMsg, "GSTAPIERR", conn);
retString = errMsg;
}
else
{
......@@ -1860,7 +1884,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
JSONObject errorJSON = getGstr1SumryResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn);
//retString = getError(errMsg, "GSTAPIERR", conn);
retString = errMsg;
}
APICallData apiCallData = new APICallData();
......@@ -1959,7 +1984,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
JSONObject errorJSON = getGstr2SumryResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn);
//retString = getError(errMsg, "GSTAPIERR", conn);
retString = errMsg;
}
}
else if(getGstr2SumryResp.getStatus() == 500)
......@@ -1967,7 +1993,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getGstr2SumryResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
//retString = getError(errMsg, "GSTAPIERR", conn);
retString = errMsg;
}
else
{
......@@ -1975,7 +2002,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
JSONObject errorJSON = getGstr2SumryResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn);
//retString = getError(errMsg, "GSTAPIERR", conn);
retString = errMsg;
}
APICallData apiCallData = new APICallData();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment