Commit 508ba595 authored by steurwadkar's avatar steurwadkar

json parsing logic changed for inserting GSTR2A data to handle null pointer exception

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@172022 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e24052f5
...@@ -5974,13 +5974,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -5974,13 +5974,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
b2bInvJsonObj = b2bInvJsonArry.getJSONObject(j); b2bInvJsonObj = b2bInvJsonArry.getJSONObject(j);
iNum = b2bInvJsonObj.getString("inum"); iNum = b2bInvJsonObj.optString("inum");
iDate = b2bInvJsonObj.getString("idt"); iDate = b2bInvJsonObj.optString("idt");
amount = b2bInvJsonObj.getDouble("val"); amount = b2bInvJsonObj.optDouble("val");
docCheckSum = b2bInvJsonObj.getString("chksum"); docCheckSum = b2bInvJsonObj.optString("chksum");
reversCharge = b2bInvJsonObj.getString("rchrg"); reversCharge = b2bInvJsonObj.optString("rchrg");
pos = b2bInvJsonObj.getString("pos"); pos = b2bInvJsonObj.optString("pos");
invType = b2bInvJsonObj.getString("inv_typ").trim(); invType = b2bInvJsonObj.optString("inv_typ").trim();
if(b2bInvJsonObj.has("etin")) if(b2bInvJsonObj.has("etin"))
{ {
ecomOperetorGSTIN = b2bInvJsonObj.getString("etin"); ecomOperetorGSTIN = b2bInvJsonObj.getString("etin");
...@@ -6074,7 +6074,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -6074,7 +6074,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
detInsPstmt = localConn.prepareStatement(detInsSql); detInsPstmt = localConn.prepareStatement(detInsSql);
b2bInvLineItmsArry = b2bInvJsonObj.getJSONArray("itms"); if(b2bJsonObj.has("itms"))
{
b2bInvLineItmsArry = b2bInvJsonObj.getJSONArray("itms");
}
for(int k=0; k<b2bInvLineItmsArry.length(); k++) for(int k=0; k<b2bInvLineItmsArry.length(); k++)
{ {
...@@ -6085,23 +6088,23 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -6085,23 +6088,23 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
JSONObject tempJSONObj = b2bInvLineItemObj.getJSONObject("itm_det"); JSONObject tempJSONObj = b2bInvLineItemObj.getJSONObject("itm_det");
rate = tempJSONObj.getDouble("rt"); rate = tempJSONObj.optDouble("rt");
lineAmt = tempJSONObj.getDouble("txval"); lineAmt = tempJSONObj.optDouble("txval");
if(tempJSONObj.has("iamt")) if(tempJSONObj.has("iamt"))
{ {
iamt = tempJSONObj.getDouble("iamt"); iamt = tempJSONObj.optDouble("iamt");
} }
if(tempJSONObj.has("camt")) if(tempJSONObj.has("camt"))
{ {
camt = tempJSONObj.getDouble("camt"); camt = tempJSONObj.optDouble("camt");
} }
if(tempJSONObj.has("samt")) if(tempJSONObj.has("samt"))
{ {
samt = tempJSONObj.getDouble("samt"); samt = tempJSONObj.optDouble("samt");
} }
if(tempJSONObj.has("csamt")) if(tempJSONObj.has("csamt"))
{ {
csamt = tempJSONObj.getDouble("csamt"); csamt = tempJSONObj.optDouble("csamt");
} }
if(stateCode.trim().equalsIgnoreCase(pos.trim())) if(stateCode.trim().equalsIgnoreCase(pos.trim()))
...@@ -6537,15 +6540,20 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -6537,15 +6540,20 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"); chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
if(gstr2InvoiceJsonObj.has("cdn"))
cdnArry = gstr2InvoiceJsonObj.getJSONArray("cdn"); {
cdnArry = gstr2InvoiceJsonObj.getJSONArray("cdn");
}
for(int i = 0; i < cdnArry.length(); i++) for(int i = 0; i < cdnArry.length(); i++)
{ {
cdnJsonObj = cdnArry.getJSONObject(i); cdnJsonObj = cdnArry.getJSONObject(i);
cptyGSTIN = cdnJsonObj.getString("ctin"); cptyGSTIN = cdnJsonObj.optString("ctin");
cdnJsonArry = cdnJsonObj.getJSONArray("nt"); if(cdnJsonObj.has("nt"))
{
cdnJsonArry = cdnJsonObj.getJSONArray("nt");
}
for(int j=0; j<cdnJsonArry.length(); j++) for(int j=0; j<cdnJsonArry.length(); j++)
{ {
...@@ -6560,14 +6568,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -6560,14 +6568,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
cdnDataJsonObj = cdnJsonArry.getJSONObject(j); cdnDataJsonObj = cdnJsonArry.getJSONObject(j);
creditDebitId = cdnDataJsonObj.getString("nt_num"); creditDebitId = cdnDataJsonObj.optString("nt_num");
creditDebitDate = cdnDataJsonObj.getString("nt_dt"); creditDebitDate = cdnDataJsonObj.optString("nt_dt");
creditDebitType = cdnDataJsonObj.getString("ntty"); creditDebitType = cdnDataJsonObj.optString("ntty");
amount = cdnDataJsonObj.getDouble("val"); amount = cdnDataJsonObj.optDouble("val");
invoiceId = cdnDataJsonObj.getString("inum"); invoiceId = cdnDataJsonObj.optString("inum");
invoiceDate = cdnDataJsonObj.getString("idt"); invoiceDate = cdnDataJsonObj.optString("idt");
docCheckSum = cdnDataJsonObj.getString("chksum"); docCheckSum = cdnDataJsonObj.optString("chksum");
reason = cdnDataJsonObj.getString("rsn"); reason = cdnDataJsonObj.optString("rsn");
if("C".equalsIgnoreCase(creditDebitType)) if("C".equalsIgnoreCase(creditDebitType))
{ {
...@@ -6638,7 +6646,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -6638,7 +6646,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
detInsPstmt = localConn.prepareStatement(detInsSql); detInsPstmt = localConn.prepareStatement(detInsSql);
cdnInvLineItmsArry = cdnDataJsonObj.getJSONArray("itms"); if(cdnDataJsonObj.has("itms"))
{
cdnInvLineItmsArry = cdnDataJsonObj.getJSONArray("itms");
}
for(int k=0; k<cdnInvLineItmsArry.length(); k++) for(int k=0; k<cdnInvLineItmsArry.length(); k++)
{ {
...@@ -6648,23 +6659,23 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -6648,23 +6659,23 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
lineNo++; lineNo++;
JSONObject tempJSONObj = cdnInvLineItemObj.getJSONObject("itm_det"); JSONObject tempJSONObj = cdnInvLineItemObj.getJSONObject("itm_det");
rate = tempJSONObj.getDouble("rt"); rate = tempJSONObj.optDouble("rt");
lineAmt = tempJSONObj.getDouble("txval"); lineAmt = tempJSONObj.optDouble("txval");
if(tempJSONObj.has("iamt")) if(tempJSONObj.has("iamt"))
{ {
iamt = tempJSONObj.getDouble("iamt"); iamt = tempJSONObj.optDouble("iamt");
} }
if(tempJSONObj.has("camt")) if(tempJSONObj.has("camt"))
{ {
camt = tempJSONObj.getDouble("camt"); camt = tempJSONObj.optDouble("camt");
} }
if(tempJSONObj.has("samt")) if(tempJSONObj.has("samt"))
{ {
samt = tempJSONObj.getDouble("samt"); samt = tempJSONObj.optDouble("samt");
} }
if(tempJSONObj.has("csamt")) if(tempJSONObj.has("csamt"))
{ {
csamt = tempJSONObj.getDouble("csamt"); csamt = tempJSONObj.optDouble("csamt");
} }
if(iamt > 0) if(iamt > 0)
......
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