接口调整

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

@@ -95,8 +95,8 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("AA_MATURITYDATE") != null){
 						  capitalSideLoanOther.setRepaymentData(map.get("AA_MATURITYDATE").toString());  //还款日期
 					  }
-					  if(map.get("FINANCINGRATIO") != null){
-						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("FINANCINGRATIO").toString()));    //放款年利率
+					  if(map.get("aa_interestrate") != null){
+						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("aa_interestrate").toString()));    //放款年利率
 					  }
 					  if(map.get("AA_REPAYMENTFREQUENCY") != null){
 						  capitalSideLoanOther.setRepaymentFrequency(map.get("AA_REPAYMENTFREQUENCY").toString());   //还息频率
@@ -116,11 +116,11 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("AA_INTERESTPAYABLE") != null){
 						  capitalSideLoanOther.setInterestPayable(Double.valueOf(map.get("AA_INTERESTPAYABLE").toString()));   //应还利息（元)
 					  }
-					  if(map.get("AA_BEOVERDUE") != null){
-						  capitalSideLoanOther.setBeOverdue(Integer.valueOf(map.get("AA_BEOVERDUE").toString()));   //是否逾期
+					  if(map.get("aa_isoverdue") != null){
+						  capitalSideLoanOther.setBeOverdue(Integer.valueOf(map.get("aa_isoverdue").toString()));   //是否逾期
 					  }
-					  if(map.get("AA_SETTLE") != null ){
-						  capitalSideLoanOther.setSettle(Integer.valueOf(map.get("AA_SETTLE").toString()));   //是否结清
+					  if(map.get("aa_iscloseoff") != null ){
+						  capitalSideLoanOther.setSettle(Integer.valueOf(map.get("aa_iscloseoff").toString()));   //是否结清
 				      }
 					  if(map.get("AA_APPLYDATE") != null ){
 						  capitalSideLoanOther.setApplyDate(map.get("AA_APPLYDATE").toString());   //申请日期
@@ -139,16 +139,35 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("aa_auditman") != null){
 						  capitalSideLoanOther.setApprovalMan(map.get("aa_auditman").toString()); //审批人
 					  }
-					  //还款计划
-					  OpenCapitalSideRepaymentPlanOther.Builder capitalSideRepaymentPlanOther = OpenCapitalSideRepaymentPlanOther.newBuilder();
-					    capitalSideRepaymentPlanOther.setRepaymentData("2020-2-25");
-					    capitalSideRepaymentPlanOther.setCurrency("RMB");
-					    capitalSideRepaymentPlanOther.setCapitalAmount(10000);
-					    capitalSideRepaymentPlanOther.setInterest(1000);
-					    capitalSideRepaymentPlanOther.setAmount(101000);
-					    capitalSideRepaymentPlanOther.setPersonInCharge("lzx");
-					    req.addCapitalSideRepaymentPlan(capitalSideRepaymentPlanOther);
-					
+					  
+					//还款计划
+					  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")+"';"); 
+					  for(int i = 0;i<reList.size();i++){
+						
+						  OpenCapitalSideRepaymentPlanOther.Builder capitalSideRepaymentPlanOther = OpenCapitalSideRepaymentPlanOther.newBuilder();
+						  if(reList.get(i).get("rp_backdate") != null){
+							  capitalSideRepaymentPlanOther.setRepaymentData(reList.get(i).get("rp_backdate").toString());   //还款日期
+						  }
+						  if(reList.get(i).get("rp_currency") != null){
+							   capitalSideRepaymentPlanOther.setCurrency(reList.get(i).get("rp_currency").toString());    //业务币种
+						  } 
+						  if(reList.get(i).get("rp_principal") != null){
+							   capitalSideRepaymentPlanOther.setCapitalAmount(Double.valueOf(reList.get(i).get("rp_principal").toString()));   //本期应还本金  
+						  }
+						    
+						  if(reList.get(i).get("rp_interest") != null){
+							   capitalSideRepaymentPlanOther.setInterest(Double.valueOf(reList.get(i).get("rp_interest").toString()));     //本期应还利息  
+						  }
+						  if(reList.get(i).get("rp_thisback") != null){
+							   capitalSideRepaymentPlanOther.setAmount(Double.valueOf(reList.get(i).get("rp_thisback").toString()));    //本期还款额  
+						  }
+						  if(reList.get(i).get("rp_truster") != null){
+							   capitalSideRepaymentPlanOther.setPersonInCharge(reList.get(i).get("rp_truster").toString());    //经办人  
+						  }
+						    req.addCapitalSideRepaymentPlan(capitalSideRepaymentPlanOther);
+					  }
+					  
 					    //req.setEnuu(10050877);
 					   req.setCapitalSideLoan(capitalSideLoanOther);
 					   Master ceuuMaster = ContextHolder.getMaster();
@@ -181,15 +200,16 @@ public class QuoteInfo  extends AbstractTask{
 		 */
 	private List<Map<String, Object>> getAccountApplyUpload() {
 			List<Map<String, Object>> maps = jdbcTemplate.queryForList(" select * from ("
-        +" select AA_ID,AA_FINANCEDEMANDCODE,AA_LOANCODE,AA_CSENUU,AA_FSENUU,AA_RECEIVABLESARRIVALDATE,AA_FINANCERATE,AA_LOANAMOUNT,"
+        +" select 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_BEOVERDUE,AA_SETTLE,AA_PERSONINCHARGE,aa_auditman,aa_auditdate,AA_BACKDATE,AA_APPLYDATE,AA_ACTPAYDATE"
-        + "AA_B2BSTATUS,AA_MATURITYDATE,AA_DUEAMOUNT,AA_LENDRATE,FINANCINGRATIO,aa_bank,aa_custaccount,"
-        + "aa_backbankno,aa_truster from ACCOUNTAPPLY left join  ACCEPTOFFER on FINANCECODE = AA_FINANCEDEMANDCODE "
+        +" 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 "
         +" where AA_UPLOADSTATUS = '待上传' order by aa_code) where rownum < 100");
 			System.out.println(maps);
 		 return maps;
 		}
+	
 
 	/**
      * 报价记录下载
@@ -207,7 +227,7 @@ public class QuoteInfo  extends AbstractTask{
 		req.setPageNumber(1);
 		req.setPageSize(100);
 		Calendar beforeTime = Calendar.getInstance();
-		beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
+		//beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
 		Date beforeD = beforeTime.getTime();
 		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
@@ -253,6 +273,13 @@ public class QuoteInfo  extends AbstractTask{
 			//放款记录
 			if(Finance.getAcceptOfferInfo().getStatus() == 1002){
  				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
+ 				
+ 				String Pay = null;
+ 				if(Finance.getAcceptOfferInfo().getPayments().equals("到期一次性还本付息")){
+ 					Pay = "到期一次性付息"; 
+ 				}else{
+ 					Pay = Finance.getAcceptOfferInfo().getPayments();
+ 				}
 				sqlloand.add("MERGE INTO AccountApply a"
 					    +" USING (SELECT nvl(max(AA_ID),0) ID from AccountApply where AA_FINANCEDEMANDCODE = '"+Finance.getFinanceDemandInfo().getCode()+"') b"
 					    +" ON (a.AA_ID = b.ID)"
@@ -272,12 +299,12 @@ public class QuoteInfo  extends AbstractTask{
 	        			+ "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_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,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"
-    			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',sysdate,null,sysdate,null,null,'ENTERING',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,null,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getCode()+"',"
     					+ "'"+aaCode+"','"+Finance.getAcceptOfferInfo().getCsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnName()+"',"