接口调整

src/main/java/com/uas/erp/schedular/finance/task/B2BInformation.java

@@ -12,6 +12,7 @@ import java.util.Set;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.erp.schedular.entity.Master;
 import com.uas.erp.schedular.task.support.Method;
 import com.usoft.fin.external.open.api.entity.CapitalSideLoan;
 import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
@@ -21,11 +22,13 @@ import com.usoft.sdk.fin.client.CapitalSideSdk;
 import com.usoft.sdk.fin.client.TradingHallSdk;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.descriptor.web.ContextHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.TaskMapping;
+import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.fin.external.open.api.entity.CompanyBasicInfosByErmRest;
 import com.usoft.fin.external.open.api.entity.CompanyEnterpriseCrawlerListFinRest;
 import com.usoft.fin.external.open.api.entity.CompanyIndustryAndCommerceInfoRest;
@@ -416,8 +419,10 @@ public class B2BInformation  extends AbstractTask{
         GetCapitalSideLoanReq.Builder req = GetCapitalSideLoanReq.newBuilder();
         req.setPageSize(100);
         req.setPageNumber(1);
+        Master ceuuMaster = ContextHolder.getMaster();
+        req.setCsEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
         //req.setCsEnuu(10050877);  //保理企业UU
-        req.setCsEnuu(10050877);    //优软商城企业UU com.usoft.fin.external.open.api.entity.
+        //req.setCsEnuu(10050877);    //优软商城企业UU com.usoft.fin.external.open.api.entity.
 		Calendar beforeTime = Calendar.getInstance();
 		beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
 		Date beforeD = beforeTime.getTime();
@@ -508,7 +513,8 @@ public class B2BInformation  extends AbstractTask{
     	final List<String> sqlsDemand = new ArrayList<>();
     	final List<String> sqlloand = new ArrayList<>();
     	GetFinanceOfferListReq.Builder req = GetFinanceOfferListReq.newBuilder();
-		req.setEnuu(10050877);
+    	Master ceuuMaster = ContextHolder.getMaster();
+        req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
 		req.setPageNumber(1);
 		req.setPageSize(100);
 		//Calendar beforeTime = Calendar.getInstance();
@@ -561,11 +567,48 @@ public class B2BInformation  extends AbstractTask{
 			
 			if(Finance.getAcceptOfferInfo().getStatus() == 1002){
 				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
-				sqlloand.add("insert into AccountApply(AA_ID, AA_CODE, AA_CUSTCODE, AA_CUSTNAME, AA_STATUS, AA_SACODES, AA_BILLCODES,"
+				sqlloand.add("MERGE INTO AccountApply a"
+					    +" USING (SELECT nvl(max(AA_ID),0) ID from AccountApply where AA_CODE = '"+aaCode+"') b"
+					    +" ON (a.AA_ID = b.ID)"
+					    +" WHEN MATCHED THEN "
+					    +" UPDATE SET a.AA_CUSTNAME ='"+Finance.getFinanceDemandInfo().getCsUserName()+"'"
+					    +" WHEN NOT MATCHED THEN "
+                        +" INSERT(AA_ID, AA_CODE, AA_CUSTCODE, AA_CUSTNAME, AA_STATUS, AA_SACODES, AA_BILLCODES,"
 	        			+ " AA_BILLAMOUNT, AA_CURRENCY, AA_DUEAMOUNT, AA_BANK, AA_BACKBANKNO, AA_LOANDATE, AA_BACKDATE, "
 	        			+ "AA_INTERESTRATE, AA_PENALTYRATE, AA_LENDRATE, AA_EFFECTDAYS, AA_HANDRATE, AA_OTHRATE, AA_ISNOTARIZATION,"
 	        			+ " AA_OTHERS, AA_REMARK, AA_TRUSTER, AA_APPLYDATE, AA_RECORDER, AA_INDATE, AA_AUDITMAN, AA_AUDITDATE, "
 	        			+ "AA_STATUSCODE, AA_ISPENALTY, AA_CACODE, AA_INTERESTPAYMETHOD, AA_FACTORING, AA_HAND, AA_MATURITYDATE, "
+	        			+ "AA_LEFTAMOUNT, AA_INTERESTPAY, AA_AHEADPOUNDAGE, AA_OVERDUEDAYS, AA_ISCLOSEOFF, AA_CATECODE, AA_CATEDESC,"
+	        			+ " AA_ISOVERDUE, AA_ODCODE, AA_INTEREST, AA_ARID, AA_ARCODE, AA_SAAMOUNT, AA_THISPAYAMOUNT, AA_THISPAYDATE, "
+	        			+ "AA_TURNSTATUS, AA_TURNSTATUSCODE, AA_YAMOUNT, AA_MFCUSTCODE, AA_MFCUSTNAME, AA_TRANSFERAMOUNT, AA_ACTPAYDATE,"
+	        			+ " AA_DOWNPAY, AA_DOWNPAYDESC, AA_MARGIN, AA_MARGINAMOUNT, AA_MARGINDATE, AA_GRACEPERIOD, AA_GRACEDAYS, "
+	        			+ "AA_GRACERATE, AA_ASSUREMEANS, AA_CUSTACCOUNT, AA_LIVEYEAR, AA_AAID, AA_PRODUCTTYPE, AA_CLASS, AA_WANTAMOUNT, "
+	        			+ "AA_FACTORCODE, AA_FACTORNAME, AA_LASTUPDATEDATE, AA_FIRSTDATE, AA_DEBXDATE, AA_DEBJDATE, AA_SENDSTATUS, " 
+	        			+ "AA_B2BCODE, AA_AGREE, AA_MATURITY, AA_FINANCEDEMANDCODE, AA_ACCEPTOFFERCODE, AA_LOANCODE, AA_CSENUU, "
+	        			+ "AA_FSENUU, AA_FSNAME, AA_RECEIVABLESARRIVALDATE, AA_FINANCERATE, AA_LOANAMOUNT, AA_LOANRATE, "
+	        			+ "AA_REPAYMENTFREQUENCY, AA_FSCOLLECTIONBANK, AA_FSCOLLECTIONACCOUNT, AA_FSCOLLECTIONNAME, "
+	        			+ "AA_RECEIPTFORLOAN, AA_INTERESTPAYABLE, AA_BEOVERDUE, AA_SETTLE, AA_PERSONINCHARGE, AA_APPROVALDATE, "
+	        			+ "AA_APPROVALMAN, AA_UPLOADSTATUS,AA_B2BSTATUS,AA_REPAYMENTDATA,AA_B2BAA_APPLYDATE,AA_B2BAA_AUDITDATE) "
+					    
+					    + "values (AccountApply_seq.nextval,'"+aaCode+"',null,null,'在录入',null,null,null,' ',null,null,null,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate()+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
+    			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,sysdate,null,null,'ENTERING',null,null,null,null,null"
+    				    + ",null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null"
+    					+ ",null,null,null,null,null,null,null,null,null,null,null,null,null,null,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getCode()+"',"
+    					+ "'"+aaCode+"','"+Finance.getAcceptOfferInfo().getCsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnName()+"',"
+    				    + "null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,"
+    				    + "'"+Finance.getAcceptOfferInfo().getOfferRate()+"','"+Finance.getAcceptOfferInfo().getPayments()+"',null,"
+    				    + "null,null,null,null,"
+    				    + "null,null,'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,'已上传',"
+    				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");
+				/*sqlloand.add("insert into AccountApply(AA_ID, AA_CODE, AA_CUSTCODE, AA_CUSTNAME, AA_STATUS, AA_SACODES, AA_BILLCODES,"
+				 * 
+	        			+ " AA_BILLAMOUNT, AA_CURRENCY, AA_DUEAMOUNT, AA_BANK, AA_BACKBANKNO, AA_LOANDATE, AA_BACKDATE, "
+	        			+ "AA_INTERESTRATE, AA_PENALTYRATE, AA_LENDRATE, AA_EFFECTDAYS, AA_HANDRATE, AA_OTHRATE, AA_ISNOTARIZATION,"
+	        			
+	        			+ " AA_OTHERS, AA_REMARK, AA_TRUSTER, AA_APPLYDATE, AA_RECORDER, AA_INDATE, AA_AUDITMAN, AA_AUDITDATE, "
+	        			
+	        			+ "AA_STATUSCODE, AA_ISPENALTY, AA_CACODE, AA_INTERESTPAYMETHOD, AA_FACTORING, AA_HAND, AA_MATURITYDATE, "
+	        			
 	        			+ "AA_LEFTAMOUNT, AA_INTERESTPAY, AA_AHEADPOUNDAGE, AA_OVERDUEDAYS, AA_ISCLOSEOFF, AA_CATECODE, AA_CATEDESC,"
 	        			+ " AA_ISOVERDUE, AA_ODCODE, AA_INTEREST, AA_ARID, AA_ARCODE, AA_SAAMOUNT, AA_THISPAYAMOUNT, AA_THISPAYDATE, "
 	        			+ "AA_TURNSTATUS, AA_TURNSTATUSCODE, AA_YAMOUNT, AA_MFCUSTCODE, AA_MFCUSTNAME, AA_TRANSFERAMOUNT, AA_ACTPAYDATE,"
@@ -579,7 +622,7 @@ public class B2BInformation  extends AbstractTask{
 	        			+ "AA_APPROVALMAN, AA_UPLOADSTATUS,AA_B2BSTATUS,AA_REPAYMENTDATA,AA_B2BAA_APPLYDATE,AA_B2BAA_AUDITDATE) "
 	        			
 	        			+ "values (AccountApply_seq.nextval,'"+aaCode+"',null,null,'在录入',null,null,null,' ',null,null,null,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate()+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
-	        			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,sysdate,null,null,null,'ENTERING',null,null,null,null,null"
+	        			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,sysdate,null,null,'ENTERING',null,null,null,null,null"
 	        				    + ",null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null"
 	        					+ ",null,null,null,null,null,null,null,null,null,null,null,null,null,null,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getCode()+"',"
 	        					+ "'"+aaCode+"','"+Finance.getAcceptOfferInfo().getCsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnName()+"',"
@@ -587,7 +630,7 @@ public class B2BInformation  extends AbstractTask{
 	        				    + "'"+Finance.getAcceptOfferInfo().getOfferRate()+"','"+Finance.getAcceptOfferInfo().getPayments()+"',null,"
 	        				    + "null,null,null,null,"
 	        				    + "null,null,'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,'已上传',"
-	        				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");
+	        				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");*/
 			}
 		}
 		System.out.println(sqlloand);
@@ -731,7 +774,8 @@ public class B2BInformation  extends AbstractTask{
 						  capitalSideLoanOther.setApprovalMan(map.get("AA_APPROVALMAN").toString()); //审批人
 					  }
 					   req.setCapitalSideLoan(capitalSideLoanOther);
-					   req.setEnuu(10050877);
+					   Master ceuuMaster = ContextHolder.getMaster();
+				       req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
 					 AddCapitalSideLoanResp resp = capitalSideSdk.addCapitalSideLoan(req);
 					 System.out.println(resp);
 	                String s = ProtoBufUtil.toJSON(resp);