放款接口调整

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

@@ -129,6 +129,7 @@ public class QuoteInfo  extends AbstractTask{
 						  capitalSideLoanOther.setPersonInCharge(map.get("aa_truster").toString());   //经办人
 
 					  }
+					  Object status = map.get("AA_B2BSTATUS");
 					   if(map.get("AA_B2BSTATUS") != null ){
 						   capitalSideLoanOther.setStatus(Integer.valueOf(map.get("AA_B2BSTATUS").toString()));  //状态
 
@@ -141,8 +142,10 @@ public class QuoteInfo  extends AbstractTask{
 					  }
 					  
 					//还款计划
+					 /* jdbcTemplate.queryForList("select rp_backdate,rp_currency,rp_principal,rp_interest,rp_thisback,rp_truster from ReimbursementPlan"
+					  		+ " left join AccountApply on aa_code = rp_aacode", "")*/
 					  List<Map<String,Object>> reList = jdbcTemplate.queryForList(" select rp_backdate,rp_currency,rp_principal,rp_interest,rp_thisback,rp_truster from ReimbursementPlan "
-							   	+" left join AccountApply on aa_code = rp_aacode where AA_B2BSTATUS= '1002' and  aa_code = '"+map.get("aa_code")+"';"); 
+							   	+" left join AccountApply on aa_code = rp_aacode where AA_B2BSTATUS= '1002' and  aa_code = '"+map.get("aa_code")+"'"); 
 					  for(int i = 0;i<reList.size();i++){
 						
 						  OpenCapitalSideRepaymentPlanOther.Builder capitalSideRepaymentPlanOther = OpenCapitalSideRepaymentPlanOther.newBuilder();
@@ -199,12 +202,12 @@ public class QuoteInfo  extends AbstractTask{
 		 * @return
 		 */
 	private List<Map<String, Object>> getAccountApplyUpload() {
-			List<Map<String, Object>> maps = jdbcTemplate.queryForList(" select * from ("
-        +" select AA_ID,aa_code,AA_FINANCEDEMANDCODE,AA_LOANCODE,AA_CSENUU,AA_FSENUU,AA_RECEIVABLESARRIVALDATE,AA_FINANCERATE,AA_LOANAMOUNT,"
+			List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from ("
+        +" select AA_B2BSTATUS,AA_ID,aa_code,AA_FINANCEDEMANDCODE,AA_LOANCODE,AA_CSENUU,AA_FSENUU,AA_RECEIVABLESARRIVALDATE,AA_FINANCERATE,AA_LOANAMOUNT,"
         +" AA_LOANRATE,AA_REPAYMENTFREQUENCY,AA_FSCOLLECTIONBANK,AA_FSCOLLECTIONACCOUNT,AA_FSCOLLECTIONNAME,AA_RECEIPTFORLOAN,AA_INTERESTPAYABLE,"
         +" aa_isoverdue,aa_iscloseoff,AA_PERSONINCHARGE,aa_auditman,aa_auditdate,AA_BACKDATE,AA_APPLYDATE,AA_ACTPAYDATE"
-        + "AA_B2BSTATUS,AA_MATURITYDATE,AA_DUEAMOUNT,AA_LENDRATE,aa_interestrate,aa_bank,aa_custaccount,"
-        + "aa_backbankno,aa_truster from ACCOUNTAPPLY "
+        +" AA_MATURITYDATE,AA_DUEAMOUNT,AA_LENDRATE,aa_interestrate,aa_bank,aa_custaccount,"
+        +" aa_backbankno,aa_truster from ACCOUNTAPPLY "
         +" where AA_UPLOADSTATUS = '待上传' order by aa_code) where rownum < 100");
 			System.out.println(maps);
 		 return maps;
@@ -226,13 +229,21 @@ public class QuoteInfo  extends AbstractTask{
     	req.setEnuu(10050877);
 		req.setPageNumber(1);
 		req.setPageSize(100);
-		Calendar beforeTime = Calendar.getInstance();
+		//Calendar beforeTime = Calendar.getInstance();
 		//beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
-		Date beforeD = beforeTime.getTime();
-		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
+		//Date beforeD = beforeTime.getTime();
+		//req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
+		System.out.println(resp);
 		List<? extends FinanceOfferListOrBuilder> flist = resp.getFinanceOfferInfoOrBuilderList();
 		for(FinanceOfferListOrBuilder Finance :flist){
+			int status = 0;
+			if(Finance.getAcceptOfferInfo().getStatus() == 1003){   //如果报价实体状态为1003则融资实体也变更为1003
+				status = Finance.getAcceptOfferInfo().getStatus();
+			}else{
+				status = Finance.getFinanceDemandInfo().getStatus();
+			}
+					
 			//System.out.println("从表1："+Finance.toString());
 			sqls.add("MERGE INTO AcceptOffer ao"
 			+" USING (SELECT nvl(max(id),0) ID FROM AcceptOffer where CODE = '"+Finance.getAcceptOfferInfo().getCode()+"') b"
@@ -261,7 +272,7 @@ public class QuoteInfo  extends AbstractTask{
 				    +" INSERT (ID,CODE,ADOPTCODE,FINANCEDAYS,STATUS,AMOUNT,DEALAMOUNT,DEALRATE,FSENNAME,FSENUU,FSUSERNAME,FSUSERUU,FSCONTACTSMAN,"
 				    + "FSCONTACTSPHONE,CSENNAME,CSENUU,CSUSERNAME,CSUSERUU,CSCONTACTSMAN,CSCONTACTSPHONE,PUBTIME,ENDTIME,DEALTIME,OFFERCOUNT,FSDEMANDAMOUNT,UPLOADSTATUS)"
     			+ " values (ACCEPTFINANCEDEMAND_seq.nextval,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getFinanceDemandInfo().getAdoptCode()+"','"+Finance.getFinanceDemandInfo().getFinanceDays()+"',"
-    					+ "'"+Finance.getFinanceDemandInfo().getStatus()+"','"+Finance.getFinanceDemandInfo().getAmount()+"','"+Finance.getFinanceDemandInfo().getDealAmount()+"','"+Finance.getFinanceDemandInfo().getDealRate()+"',"
+    					+ "'"+status+"','"+Finance.getFinanceDemandInfo().getAmount()+"','"+Finance.getFinanceDemandInfo().getDealAmount()+"','"+Finance.getFinanceDemandInfo().getDealRate()+"',"
     				    + "'"+Finance.getFinanceDemandInfo().getFsEnName()+"','"+Finance.getFinanceDemandInfo().getFsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsUserName()+"','"+Finance.getFinanceDemandInfo().getFsUseruu()+"',"
     				    + "'"+Finance.getFinanceDemandInfo().getFsContactsMan()+"','"+Finance.getFinanceDemandInfo().getFsContactsPhone()+"','"+Finance.getFinanceDemandInfo().getCsEnName()+"','"+Finance.getFinanceDemandInfo().getCsEnuu()+"',"
     				    + "'"+Finance.getFinanceDemandInfo().getCsUserName()+"','"+Finance.getFinanceDemandInfo().getCsUseruu()+"','"+Finance.getFinanceDemandInfo().getCsContactsMan()+"',"
@@ -303,9 +314,9 @@ public class QuoteInfo  extends AbstractTask{
 	        			+ "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,AA_EDCODE) "
 					    
-					    + "values (AccountApply_seq.nextval,'"+aaCode+"',null,null,'在录入',null,null,null,' ',null,null,null,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
+					    + "values (AccountApply_seq.nextval,'"+aaCode+"',null,null,'在录入',null,null,null,' ','"+Finance.getAcceptOfferInfo().getOfferAmount()+"',null,null,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
     			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',sysdate,null,sysdate,null,null,'ENTERING',null,null,'"+Pay+"',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().getAmount()+"',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() * 100+"',null,"