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

webitm-dis/src/ibase/webitm/ejb/dis/BusinessLogicChkOverride.java

@@ -66,6 +66,7 @@ public class BusinessLogicChkOverride extends ActionHandlerEJB{
 		//double totAmt = 0.0d;
 		Timestamp today = null;
 		String errString = "";
+		String tranType="";//added by nandkumar gadkari on 01/10/19
 		try 
 		{			
 			conn = getConnection();
@@ -77,7 +78,7 @@ public class BusinessLogicChkOverride extends ActionHandlerEJB{
 			String empCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginEmpCode" );
 			userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 			System.out.println("Pavan Transaction Id::["+tranId+"]userId["+userId+"]empCode["+empCode+"]");
-			sql = "select aprv_stat, sale_order, cr_policy, amd_no from business_logic_check where tran_id = ?";
+			sql = "select aprv_stat, sale_order, cr_policy, amd_no,tran_type from business_logic_check where tran_id = ?";//tran type added by nandkumar gadkari on 01/10/19
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
@@ -87,6 +88,7 @@ public class BusinessLogicChkOverride extends ActionHandlerEJB{
 				sorder = checkNull(rs.getString("sale_order"));
 				crPolicy = checkNull(rs.getString("cr_policy"));
 				amdNo = checkNull(rs.getString("amd_no"));
+				tranType = checkNull(rs.getString("tran_type"));//tran type added by nandkumar gadkari on 01/10/19
 			}
 			rs.close();
 			rs = null;
@@ -183,42 +185,62 @@ public class BusinessLogicChkOverride extends ActionHandlerEJB{
 			}
 			else
 			{
-				sql = "select (case when confirmed is null then 'N' else confirmed end) as CONFIRMED from sorder where sale_order = ?";
-				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, sorder);
-				rs = pstmt.executeQuery(); 
-				if (rs.next()) 
-				{					
-					confirmed = checkNull(rs.getString("CONFIRMED"));
-				}
-				rs.close();
-				rs = null;
-				pstmt.close();
-				pstmt = null;
 				
-				sql = "select count(*) as cnt from business_logic_check where sale_order = ? and aprv_stat  = 'F'";
-				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, sorder);
-				rs = pstmt.executeQuery(); 
-				if (rs.next()) 
-				{					
-					overrideCnt = rs.getInt("cnt");
-				}
-				rs.close();
-				rs = null;
-				pstmt.close();
-				pstmt = null;
-				if( overrideCnt == 0 )
-				{ 
+				
+				if(!"C".equalsIgnoreCase(tranType))//condition added by nandkumar gadkari on 01/10/19
+				{
+					sql = "select (case when confirmed is null then 'N' else confirmed end) as CONFIRMED from sorder where sale_order = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, sorder);
+					rs = pstmt.executeQuery(); 
+					if (rs.next()) 
+					{					
+						confirmed = checkNull(rs.getString("CONFIRMED"));
+					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
 					
-					sql = "update sorder set cr_check_stat = 'O' where sale_order = ?";
+					sql = "select count(*) as cnt from business_logic_check where sale_order = ? and aprv_stat  = 'F'";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, sorder);
+					rs = pstmt.executeQuery(); 
+					if (rs.next()) 
+					{					
+						overrideCnt = rs.getInt("cnt");
+					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					if( overrideCnt == 0 )
+					{ 
+						
+						sql = "update sorder set cr_check_stat = 'O' where sale_order = ?";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, sorder);
+						updCnt = pstmt.executeUpdate();
+						System.out.println("");
+						pstmt.close();
+						pstmt = null;
+						System.out.println("BUSINESS_LOGIC_CHECK 4rd updCnt[ "+updCnt+" ]");
+					}
+				}
+				else//condition added by nandkumar gadkari on 01/10/19
+				{
+					sql = "select (case when confirmed is null then 'N' else confirmed end) as confirmed from charge_back where tran_id = ?";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, sorder);
-					updCnt = pstmt.executeUpdate();
-					System.out.println("");
+					rs = pstmt.executeQuery(); 
+					if (rs.next()) 
+					{					
+						confirmed = checkNull(rs.getString("CONFIRMED"));
+					}
+					rs.close();
+					rs = null;
 					pstmt.close();
 					pstmt = null;
-					System.out.println("BUSINESS_LOGIC_CHECK 4rd updCnt[ "+updCnt+" ]");
 				}
 				
 				if("N".equals(confirmed))
@@ -238,9 +260,12 @@ public class BusinessLogicChkOverride extends ActionHandlerEJB{
 					System.out.println("unconfirmed cnt "+cnt);
 			        if( cnt == 0 )
 			         {	
-			        	sordConf = new SorderConf();			        				         
-			            errString =  sordConf.confirmSorder(sorder, "", xtraParams, conn);
-			        	sordConf = null;	
+			        	if(!"C".equalsIgnoreCase(tranType))//condition added by nandkumar gadkari on 01/10/19
+						{
+			        		sordConf = new SorderConf();			        				         
+				            errString =  sordConf.confirmSorder(sorder, "", xtraParams, conn);
+				        	sordConf = null;	
+						}
 			        	System.out.println("Sorder Confirm returning... ["+errString+"]");
 			        	if (errString.indexOf("VTCNFSUCC") > 0 || errString.trim().length() == 0)			    
 						{