代码提交

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

@@ -73,9 +73,10 @@ public class B2BInformation  extends AbstractTask{
 		Master currMaster = ContextHolder.getMaster();
     	GetOfferQuotaInfoListReq.Builder req = GetOfferQuotaInfoListReq.newBuilder();
     	req.setCsEnuu(Integer.valueOf(currMaster.getMa_uu().toString()));
-		req.setPageNumber(1);
-		req.setPageSize(50);
-		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
+    	//req.setCsEnuu(10050877);
+		//req.setPageNumber(1);
+		//req.setPageSize(50);
+		//req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetOfferQuotaInfoListResp resp = capitalSideSdk.getOfferQuotaInfoList(req);
 		java.util.List<OfferQuotaInfoRest> restlist = resp.getOfferQuoteInfoList();
 		//System.out.println("restlist-size:"+restlist.size());
@@ -188,9 +189,10 @@ public class B2BInformation  extends AbstractTask{
 						" CU_LICENSEDATE = "+cu_licensedate+",CU_PAPERSCODE='"+compBaseInfoByErmRest.getEnCodeCrawled()+"'," +
 						" CU_TAXCREDIT ='"+compIndusAndCommInforRest.getUnifiedSocialCreditCode()+"',CU_REGISTSTATUS='"+compBaseInfoByErmRest.getEnRegStatus()+"',CU_BUSINSSCOPE='"+compBaseInfoByErmRest.getEnOpRange()+"',CU_BUSINESSMAIN='"+restBaseInfo.getEnBusinessMain()+"'," +
 						" CU_CONTACT='"+restBaseInfo.getFsContactsMan()+"',CU_CONTACTNUM='"+restBaseInfo.getFsContactsPhone()+"',CU_REGCAPITAL="+cu_regcapital+",CU_PAIDINCAPITAL="+cu_paidincapital+"," +
-						" CU_REGADD='"+compBaseInfoByErmRest.getEnRegLocation()+"',CU_OFFICEADD='"+restBaseInfo.getEnAddress()+"',CU_INTRODUCTION='"+compLawInfoRest.getEnIntro()+"'," +
+						" CU_REGADD='"+compBaseInfoByErmRest.getEnRegLocation()+"',CU_OFFICEADD='"+restBaseInfo.getEnAddress()+"',CU_INTRODUCTION='"+compLawInfoRest.getEnIntro()+"',cu_zjuu='"+10050877+"'" +
 						" CU_EMPLOYEESNUM=" +cu_employeesnum+
 						" WHERE CU_ENUU = "+custUU+" AND CU_STATUSCODE <> 'DISABLE'");
+				System.out.println(sqls);
 				//从表1 高管信息 CUSTOMEREXCUTIVE
 				JSONArray enKeyPerList = JSONArray.parseArray(compBaseInfoByErmRest.getEnKeyPersonnel());
 				//System.out.println("更新高管信息:"+compBaseInfoByErmRest.getEnKeyPersonnel());
@@ -306,12 +308,12 @@ public class B2BInformation  extends AbstractTask{
 						"CU_TERM,CU_TYPE,CU_PLAFORMLEVEL,CU_LICENSEDATE,CU_PAPERSCODE," +
 						"CU_TAXCREDIT,CU_REGISTSTATUS,CU_BUSINSSCOPE,CU_BUSINESSMAIN," +
 						"CU_CONTACT,CU_CONTACTNUM,CU_REGCAPITAL,CU_PAIDINCAPITAL," +
-						"CU_REGADD,CU_OFFICEADD,CU_INTRODUCTION,CU_EMPLOYEESNUM" +
+						"CU_REGADD,CU_OFFICEADD,CU_INTRODUCTION,CU_EMPLOYEESNUM,cu_zjuu" +
 						") VALUES ("+cuId+",'"+cuCode+"',"+compBaseInfoByErmRest.getEnuu()+",'在录入','ENTERING',SYSDATE,'"+compBaseInfoByErmRest.getEnName()+"','"+compBaseInfoByErmRest.getEnLegalRepName()+"',"
 						+cu_term+","+"'"+compBaseInfoByErmRest.getEnType()+"','"+restBaseInfo.getGrade()+"'," +cu_licensedate+",'"+compBaseInfoByErmRest.getEnCodeCrawled()+"',"+
 						"'"+compIndusAndCommInforRest.getUnifiedSocialCreditCode()+"','"+compBaseInfoByErmRest.getEnRegStatus()+"','"+compBaseInfoByErmRest.getEnOpRange()+"','"+restBaseInfo.getEnBusinessMain()+"',"+
 						"'"+restBaseInfo.getFsContactsMan()+"','"+restBaseInfo.getFsContactsPhone()+"',"+cu_regcapital+","+cu_paidincapital+",'"
-						+compBaseInfoByErmRest.getEnRegLocation()+"','"+restBaseInfo.getEnAddress()+"','"+compLawInfoRest.getEnIntro()+"',"+cu_employeesnum+")");
+						+compBaseInfoByErmRest.getEnRegLocation()+"','"+restBaseInfo.getEnAddress()+"','"+compLawInfoRest.getEnIntro()+"',"+cu_employeesnum+",'10050877')");
 				sqls.add("UPDATE CUSTOMERQUOTA SET cq_custcode ='"+cuCode+"' where cq_custcode is null and CQ_CUSTUU = "+custUU);
 				//从表2 高管信息 CUSTOMEREXCUTIVE
 //				高管信息-高管姓名	CUSTOMEREXCUTIVE.ce_name	enKeyPersonnel
@@ -413,105 +415,12 @@ public class B2BInformation  extends AbstractTask{
 		//System.out.println("COMMONSQLS:"+sqls);
 		jdbcTemplate.batchExecute(sqls);
 	}
-	/**
-	 * 下载放款记录列表
-	 * @throws Exception
-	 */
-	@TaskMapping(title = "放款记录下载", fixedDelay = 30000, method = Method.DOWNLOAD)
-    public void getCapitalSideLoan() throws Exception {
-		final List<String> sqls = new ArrayList<>();
-        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.
-		Calendar beforeTime = Calendar.getInstance();
-		beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
-		Date beforeD = beforeTime.getTime();
-		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
-        GetCapitalSideLoanResp resp = capitalSideSdk.getCapitalSideLoan(req);
-        java.util.List<CapitalSideLoan> rlist = resp.getCapitalSideLoanList();
-        for(CapitalSideLoan loan :rlist){
-        	String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
-        	/*sqls.add("MERGE INTO AccountApply a"
-        			+" USING (SELECT nvl(max(id),0) ID FROM AccountApply where AA_LOANCODE = '"+loan.getLoanCode()+"') b"
-        		    +" ON (a.ID = b.ID)"
-        		    +" WHEN MATCHED THEN "
-        		    +" UPDATE SET a.AA_LOANDATE = '"+loan.getLoanDate()+"',a.AA_BACKDATE = '"+loan.getRepaymentData()+"', a.AA_TRUSTER ='"+loan.getPersonInCharge()+"',"
-        		    + "a.AA_APPLYDATE ='"+loan.getApplyDate()+"',a.AA_AUDITMAN ='"+loan.getApprovalMan()+"',a.AA_AUDITDATE='"+loan.getApprovalMan()+"',a.AA_AUDITDATE ='"+loan.getApprovalDate()+"',"
-        		    + "a.AA_LOANAMOUNT = '"+loan.getLoanAmount()+"',a.AA_FINANCEDEMANDCODE = '"+loan.getFinanceDemandCode()+"',a.AA_RECEIVABLESARRIVALDATE ='"+loan.getReceivablesArrivalDate()+"',"
-        		    + "a.AA_LOANRATE ='"+loan.getLoanRate()+"',a.AA_REPAYMENTFREQUENCY = '"+loan.getRepaymentFrequency()+"',a.AA_FSCOLLECTIONBANK ='"+loan.getFsCollectionBank()+"',"
-        		    + "a.AA_FSCOLLECTIONACCOUNT ='"+loan.getFsCollectionAccount()+"',a.AA_FSCOLLECTIONNAME ='"+loan.getFsCollectionName()+"',a.AA_RECEIPTFORLOAN ='"+loan.getReceiptForLoan()+"',"
-        		    + "a.AA_INTERESTPAYABLE='"+loan.getInterestPayable()+"',a.AA_BEOVERDUE='"+loan.getBeOverdue()+"',a.AA_SETTLE='"+loan.getSettle()+"',a.AA_PERSONINCHARGE'"+loan.getPersonInCharge()+"',"
-        		    + "a.AA_APPROVALDATE='"+loan.getApprovalDate()+"',a.AA_APPROVALMAN='"+loan.getApprovalMan()+"',a.AA_B2BSTATUS='"+loan.getStatus()+"',a.AA_REPAYMENTDATA= '"+loan.getRepaymentData()+"'"
-        		    +" 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,to_date('"+loan.getLoanDate()+"','yyyy-MM-dd'),to_date('"+loan.getRepaymentData()+"','yyyy-MM-dd'),'"+loan.getLoanRate()+"',null,'"+loan.getFinanceRate()+"',null,null,null,null,null,null"
-			        + ",'"+loan.getPersonInCharge()+"',to_date('"+loan.getApplyDate()+"','yyyy-MM-dd'),null,null,'"+loan.getApprovalMan()+"',to_date('"+loan.getApprovalDate()+"','yyyy-MM-dd'),'ENTERING',null,null,null,null,null"
-				    + ",to_date('"+loan.getReceivablesArrivalDate()+"','yyyy-MM-dd'),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,'"+loan.getFinanceDemandCode()+"','"+loan.getAcceptOfferCode()+"',"
-					+ "'"+loan.getLoanCode()+"','"+loan.getCsEnuu()+"','"+loan.getFsEnuu()+"','"+loan.getFsName()+"',"
-				    + "'"+loan.getReceivablesArrivalDate()+"','"+loan.getFinanceRate()+"','"+loan.getLoanAmount()+"',"
-				    + "'"+loan.getLoanRate()+"','"+loan.getRepaymentFrequency()+"','"+loan.getFsCollectionBank()+"',"
-				    + "'"+loan.getFsCollectionAccount()+"','"+loan.getFsCollectionName()+"','"+loan.getReceiptForLoan()+"','"+loan.getInterestPayable()+"',"
-				    + "'"+loan.getBeOverdue()+"','"+loan.getSettle()+"','"+loan.getPersonInCharge()+"','"+loan.getApprovalDate()+"','"+loan.getApprovalMan()+"','已上传',"
-				    + "'"+loan.getStatus()+"','"+loan.getRepaymentData()+"','"+loan.getApplyDate()+"','"+loan.getApprovalDate()+"')");*/
-        	
-        	
-        	/*sqls.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,"
-        			+ " 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,to_date('"+loan.getLoanDate()+"','yyyy-MM-dd'),to_date('"+loan.getRepaymentData()+"','yyyy-MM-dd'),'"+loan.getLoanRate()+"',null,'"+loan.getFinanceRate()+"',null,null,null,null,null,null"
-        			        + ",'"+loan.getPersonInCharge()+"',to_date('"+loan.getApplyDate()+"','yyyy-MM-dd'),null,null,'"+loan.getApprovalMan()+"',to_date('"+loan.getApprovalDate()+"','yyyy-MM-dd'),'ENTERING',null,null,null,null,null"
-        				    + ",to_date('"+loan.getReceivablesArrivalDate()+"','yyyy-MM-dd'),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,'"+loan.getFinanceDemandCode()+"','"+loan.getAcceptOfferCode()+"',"
-        					+ "'"+loan.getLoanCode()+"','"+loan.getCsEnuu()+"','"+loan.getFsEnuu()+"','"+loan.getFsName()+"',"
-        				    + "'"+loan.getReceivablesArrivalDate()+"','"+loan.getFinanceRate()+"','"+loan.getLoanAmount()+"',"
-        				    + "'"+loan.getLoanRate()+"','"+loan.getRepaymentFrequency()+"','"+loan.getFsCollectionBank()+"',"
-        				    + "'"+loan.getFsCollectionAccount()+"','"+loan.getFsCollectionName()+"','"+loan.getReceiptForLoan()+"','"+loan.getInterestPayable()+"',"
-        				    + "'"+loan.getBeOverdue()+"','"+loan.getSettle()+"','"+loan.getPersonInCharge()+"','"+loan.getApprovalDate()+"','"+loan.getApprovalMan()+"','已上传',"
-        				    + "'"+loan.getStatus()+"','"+loan.getRepaymentData()+"','"+loan.getApplyDate()+"','"+loan.getApprovalDate()+"')");*/
-        }
-        System.out.println(sqls);
-        jdbcTemplate.batchExecute(sqls);
-       
-    }
 
 	  /**
 		* 上传放款信息
 		* @throws Exception
 		*/
-	@TaskMapping(title = "上传放款信息", fixedDelay = 60000, method = Method.UPLOAD)
+	@TaskMapping(title = "上传放款信息", fixedDelay = 30000, method = Method.UPLOAD)
 	public void addCapitalSideLoan() throws Exception  {
 		   
 		    List<Map<String, Object>> capitalSideLoan = getAccountApplyUpload();  //获取需要上传的放款申请
@@ -642,7 +551,7 @@ public class B2BInformation  extends AbstractTask{
 	 * 上传卖方客户额度申请
 	 * @throws Exception
 	 */
-	@TaskMapping(title = "上传卖方客户额度申请", fixedDelay = 60000, method = Method.UPLOAD)
+	@TaskMapping(title = "上传卖方客户额度申请", fixedDelay = 30000, method = Method.UPLOAD)
 	public void saveOfferQuotaInfoReq() throws Exception{
 		List<Map<String, Object>> customerQuotaUpload = getCustomerQuotaUpload();
 		if (!CollectionUtils.isEmpty(customerQuotaUpload)) {
@@ -770,10 +679,7 @@ public class B2BInformation  extends AbstractTask{
 			+" USING (SELECT nvl(max(id),0) ID FROM AcceptOffer where CODE = '"+Finance.getAcceptOfferInfo().getCode()+"') b"
 		    +" ON (ao.ID = b.ID)"
 		    +" WHEN MATCHED THEN "
-		    +" UPDATE SET ao.OFFERAMOUNT='"+Finance.getAcceptOfferInfo().getOfferAmount()+"',ao.FINANCERATE = '"+Finance.getAcceptOfferInfo().getOfferRate()+"',ao.FINANCEDAYS ='"+Finance.getAcceptOfferInfo().getFinanceDays()+"',"
-		    	+ "ao.CAPITALSIDENAME = '"+Finance.getAcceptOfferInfo().getCapitalSideName()+"',ao.CSCONTACTSMAN = '"+Finance.getAcceptOfferInfo().getCsContactsMan()+"',ao.FSCONTACTSPHONE = '"+Finance.getAcceptOfferInfo().getFsContactsPhone()+"',"
-		    	+ "ao.OFFERTIME = '"+Finance.getAcceptOfferInfo().getOfferTime()+"',ao.STATUS = '"+Finance.getAcceptOfferInfo().getStatus()+"',ao.PAYMENTS ='"+Finance.getAcceptOfferInfo().getPayments()+"',"
-		    	+ " ao.FINANCINGRATIO = '"+Finance.getAcceptOfferInfo().getFinanceRate()+"' "
+		    +" UPDATE SET ao.STATUS = '"+Finance.getAcceptOfferInfo().getStatus()+"' "
 		    +" WHEN NOT MATCHED THEN"
 		    +" INSERT (ID,CODE,FINANCECODE,OFFERAMOUNT,FINANCERATE,FINANCEDAYS,CAPITALSIDENAME,CSCONTACTSMAN,CSCONTACTSPHONE,CSENUU,"
 		    +" CSUSERUU,CSUSERNAME,FINANCESIDENAME,FSCONTACTSMAN,FSCONTACTSPHONE,OFFERTIME,STATUS,PAYMENTS,OFFERRATE,FINANCINGRATIO,UPLOADSTATUS)"
@@ -781,8 +687,8 @@ public class B2BInformation  extends AbstractTask{
 				+ "'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"','"+Finance.getAcceptOfferInfo().getFinanceDays()+"','"+Finance.getAcceptOfferInfo().getCapitalSideName()+"','"+Finance.getAcceptOfferInfo().getCsContactsMan()+"',"
 			    + "'"+Finance.getAcceptOfferInfo().getCsContactsPhone()+"','"+Finance.getAcceptOfferInfo().getCsEnuu()+"','"+Finance.getAcceptOfferInfo().getCsUseruu()+"','"+Finance.getAcceptOfferInfo().getCsUserName()+"',"
 			    + "'"+Finance.getAcceptOfferInfo().getFinanceSideName()+"','"+Finance.getAcceptOfferInfo().getFsContactsMan()+"','"+Finance.getAcceptOfferInfo().getFsContactsPhone()+"','"+Finance.getAcceptOfferInfo().getOfferTime()+"',"
-			    + "'"+Finance.getAcceptOfferInfo().getStatus()+"','"+Finance.getAcceptOfferInfo().getPayments()+"','"+Finance.getAcceptOfferInfo().getOfferRate()+"',"
-			    + "'"+Finance.getAcceptOfferInfo().getFinanceRate() * 100+"','已上传')");
+			    + "'"+Finance.getAcceptOfferInfo().getStatus()+"','"+Finance.getAcceptOfferInfo().getPayments()+"','"+Finance.getAcceptOfferInfo().getFinanceRate()+"',"
+			    + "'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"','已上传')");
 			//融资需求
 			sqlsDemand.add("MERGE INTO ACCEPTFINANCEDEMAND a"
 				    +" USING (SELECT nvl(max(id),0) ID from ACCEPTFINANCEDEMAND where code = '"+Finance.getFinanceDemandInfo().getCode()+"') b"
@@ -807,7 +713,7 @@ public class B2BInformation  extends AbstractTask{
 			if(Finance.getAcceptOfferInfo().getStatus() == 1002){
 				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
 				sqlloand.add("MERGE INTO AccountApply a"
-					    +" USING (SELECT nvl(max(AA_ID),0) ID from AccountApply where AA_CODE = '"+aaCode+"') b"
+					    +" USING (SELECT nvl(max(AA_ID),0) ID from AccountApply where AA_FINANCEDEMANDCODE = '"+Finance.getFinanceDemandInfo().getCode()+"') b"
 					    +" ON (a.AA_ID = b.ID)"
 					    +" WHEN MATCHED THEN "
 					    +" UPDATE SET a.AA_CUSTNAME ='"+Finance.getFinanceDemandInfo().getCsUserName()+"'"
@@ -834,7 +740,7 @@ public class B2BInformation  extends AbstractTask{
     				    + ",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,"
+    				    + "null,'"+Finance.getAcceptOfferInfo().getFinancingRatio() * 100+"',null,"
     				    + "'"+Finance.getAcceptOfferInfo().getOfferRate()+"','"+Finance.getAcceptOfferInfo().getPayments()+"',null,"
     				    + "null,null,null,null,"
     				    + "null,null,'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,'已上传',"
@@ -843,6 +749,7 @@ public class B2BInformation  extends AbstractTask{
 		}
         jdbcTemplate.batchExecute(sqls);  //报价信息
         jdbcTemplate.batchExecute(sqlsDemand);   //融资信息
+        System.out.println(sqlloand);
         jdbcTemplate.batchExecute(sqlloand);   //放款信息
 	}
 	//报价详情

src/test/java/com/uas/erp/test/SdkTest.java

@@ -23,18 +23,12 @@ public class SdkTest extends AbstractTask {
 	 @Autowired
 	B2BInformation b2BInformation;
 	 
-	 @Test
-	 public void downCapitalSideLoan() throws Exception{
-		 Master master = new Master();
-         master.setMa_user("YITOA_BL");
-         ContextHolder.setMaster(master);
-		 b2BInformation.getCapitalSideLoan();
-	 }
 	 
 	 @Test
 	 public void downOfferQuotaInfoList() throws Exception{
 		 Master master = new Master();
          master.setMa_user("YITOA_BL");
+         master.setMa_uu(10050877L);
          ContextHolder.setMaster(master);
 		 b2BInformation.getOfferQuotaInfoList();
 	 }	
@@ -47,15 +41,6 @@ public class SdkTest extends AbstractTask {
 		 b2BInformation.getFinanceOfferList();
 	 }
 	 
-	 @Test
-	 public void getFinanceOfferDetails() throws Exception{
-		 Master master = new Master();
-         master.setMa_user("YITOA_BL");
-         master.setMa_uu(10050877L);
-         ContextHolder.setMaster(master);
-		 //b2BInformation.getFinanceOfferDetails();
-	 }
-
 	 
 	 @Test
 	 public void addCapitalSideLoan() throws Exception  {