Updated ECMOrderDAO.java . Added invalid condition for save order

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177015 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/dao/ECMOrderDAO.java

@@ -109,7 +109,7 @@ public class ECMOrderDAO {
 		JSONObject requestData = new JSONObject(data);
 	    System.out.println("Inside save Order Dao data is" +data);
 		String returnString ;
-		String result="";
+		String result="Invalid";
 		ECMUserTracker userBean = userActivityCache.getCachedUserData(uniqueId, cacheName);
 		System.out.println("inside save order userbean>" + userBean );
 		if( userBean != null ) {
@@ -126,22 +126,20 @@ public class ECMOrderDAO {
 			}
 			catch (ITMException e) {
 				// TODO Auto-generated catch block
-				System.out.println(" ITMException saveOrder :");
+				System.out.println(" ITMException saveOrder :"+e.getMessage());
 				e.printStackTrace();
 			} catch (BaseException e) {
 				// TODO Auto-generated catch block
-				System.out.println(" BaseException saveOrder :");
+				System.out.println(" BaseException saveOrder :"+e.getMessage());
 				e.printStackTrace();
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
-				System.out.println(" Exception saveOrder :");
+				System.out.println(" Exception saveOrder :" + e.getMessage());
 				e.printStackTrace();
 			}
 			System.out.println("After orderJsonObj \n returnString >> " + result);
 		}
-		else {
-			result = "Invalid";
-		}
+
 		return result;
 	}
 
@@ -451,13 +449,13 @@ public class ECMOrderDAO {
 			billTo=saleAddress.getJSONObject("billTo");
 			JSONObject billToAddress = new JSONObject();
 			billToAddress=billTo.getJSONObject("address");
-			addr1 = billToAddress.getString("addr1");
-			addr2 = billToAddress.getString("addr2");
-			addr3 = billToAddress.getString("addr3");
-			countDescr = billToAddress.getString("countDescr");
-			stateDescr = billToAddress.getString("stateDescr");
-			pinCode = billToAddress.getString("pinCode");
-			city = billToAddress.getString("city");
+			addr1 = billToAddress.optString("addr1");
+			addr2 = billToAddress.optString("addr2");
+			addr3 = billToAddress.optString("addr3");
+			countDescr = billToAddress.optString("countDescr");
+			stateDescr = billToAddress.optString("stateDescr");
+			pinCode = billToAddress.optString("pinCode");
+			city = billToAddress.optString("city");
 			billAdd=addr1+" "+addr2+" "+addr3+" "+city+" " +countDescr+" "+stateDescr+" "+pinCode;	
 			System.out.println("Inside getDetail1XML billAdd" + billAdd);
 			
@@ -465,13 +463,13 @@ public class ECMOrderDAO {
 			deliverTo=saleAddress.getJSONObject("deliverTo");
 			JSONObject dlvToAddress = new JSONObject();
 			dlvToAddress=deliverTo.getJSONObject("address");
-			addr1 = dlvToAddress.getString("addr1");
-			addr2 = dlvToAddress.getString("addr2");
-			addr3 = dlvToAddress.getString("addr3");
-			countDescr = dlvToAddress.getString("countDescr");
-			stateDescr = dlvToAddress.getString("stateDescr");
-			pinCode = dlvToAddress.getString("pinCode");
-			city = dlvToAddress.getString("city");
+			addr1 = dlvToAddress.optString("addr1");
+			addr2 = dlvToAddress.optString("addr2");
+			addr3 = dlvToAddress.optString("addr3");
+			countDescr = dlvToAddress.optString("countDescr");
+			stateDescr = dlvToAddress.optString("stateDescr");
+			pinCode = dlvToAddress.optString("pinCode");
+			city = dlvToAddress.optString("city");
 			dlvAdd=addr1+" "+addr2+" "+addr3+" "+city+" " +countDescr+" "+stateDescr+" "+pinCode;
 			System.out.println("Inside getDetail1XML dlvAdd" + dlvAdd);
 			
@@ -480,14 +478,14 @@ public class ECMOrderDAO {
 			JSONObject billAddress = new JSONObject();
 			billAddress=requestData.getJSONObject("billAddress");
 			System.out.println("In getDetail1XML billAddress" + billAddress);
-			addr1 = billAddress.getString("addr1");
-			addr2 = billAddress.getString("addr2");
-			addr3 = billAddress.getString("addr3");
-			countDescr = billAddress.getString("countDescr");
-			stateDescr = billAddress.getString("stateDescr");
-			pinCode = billAddress.getString("pinCode");
-			city = billAddress.getString("city");
-			String addrUse = billAddress.getString("addrUse");
+			addr1 = billAddress.optString("addr1");
+			addr2 = billAddress.optString("addr2");
+			addr3 = billAddress.optString("addr3");
+			countDescr = billAddress.optString("countDescr");
+			stateDescr = billAddress.optString("stateDescr");
+			pinCode = billAddress.optString("pinCode");
+			city = billAddress.optString("city");
+			String addrUse = billAddress.optString("addrUse");
 			System.out.println("cartMap.keySet() getDetail1XML addrUse" + addrUse);
 			address=addr1+" "+addr2+" "+addr3+" "+city+" " +countDescr+" "+stateDescr+" "+pinCode;
 			char addrUsed=addrUse.charAt(0);