代码提交

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

@@ -436,65 +436,79 @@ public class B2BInformation  extends AbstractTask{
 					 if(loancode != null){
 						 capitalSideLoanOther.setLoanCode(map.get("AA_LOANCODE").toString());  //放款编号
 					 }
-					 if(map.get("AA_RECEIVABLESARRIVALDATE").toString() != null){
-					    capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_RECEIVABLESARRIVALDATE").toString()); //应收账款到期日
-					  }
+					 
+					 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						Object aa_recedate = map.get("AA_RECEIVABLESARRIVALDATE");
+						//String aaredate = format.format(new Date());
+						if (aa_recedate!=null){
+							capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_RECEIVABLESARRIVALDATE").toString());
+						}
 					  if(Double.valueOf(map.get("AA_FINANCERATE").toString()) != null && Double.valueOf(map.get("AA_FINANCERATE").toString()) != 0){
 						  capitalSideLoanOther.setFinanceRate(Double.valueOf(map.get("AA_FINANCERATE").toString()));   //融资比例
 					  }
-					  if(Double.valueOf(map.get("AA_LOANAMOUNT").toString()) != null && Double.valueOf(map.get("AA_LOANAMOUNT").toString()) !=0){
+					  if(map.get("AA_LOANAMOUNT") !=null){
 					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_LOANAMOUNT").toString()));    //放款金额（元）
 					    }
-					  if(map.get("AA_LOANRATE").toString() != null){
+					  if(map.get("AA_LOANRATE") != null){
 						  capitalSideLoanOther.setLoanDate(map.get("AA_LOANRATE").toString());   //放款日期
 					  }
-					  if(map.get("AA_BACKDATE").toString() != null){
+					  if(map.get("AA_BACKDATE") != null){
 						  capitalSideLoanOther.setRepaymentData(map.get("AA_BACKDATE").toString());  //还款日期
 					  }
-					  if(Double.valueOf(map.get("AA_LOANRATE").toString()) != null && Double.valueOf(map.get("AA_LOANRATE").toString()) != 0){
+					  if(map.get("AA_LOANRATE") != null){
 						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("AA_LOANRATE").toString()));    //放款年利率
 					  }
-					  if(map.get("AA_REPAYMENTFREQUENCY").toString() != null){
+					  if(map.get("AA_REPAYMENTFREQUENCY") != null){
 						  capitalSideLoanOther.setRepaymentFrequency(map.get("AA_REPAYMENTFREQUENCY").toString());   //还息频率
 					  }
-					   if(map.get("AA_FSCOLLECTIONBANK").toString() != null){
+					   if(map.get("AA_FSCOLLECTIONBANK") != null){
 						   capitalSideLoanOther.setFsCollectionBank(map.get("AA_FSCOLLECTIONBANK").toString());    //客户收款开户行
 					   }
-					    if(map.get("AA_FSCOLLECTIONACCOUNT").toString() != null){
+					    if(map.get("AA_FSCOLLECTIONACCOUNT") != null){
 					    	capitalSideLoanOther.setFsCollectionAccount(map.get("AA_FSCOLLECTIONACCOUNT").toString());   //客户收款账号
 					    }
-					  if(map.get("AA_FSCOLLECTIONNAME").toString() != null){
+					  if(map.get("AA_FSCOLLECTIONNAME") != null){
 						  capitalSideLoanOther.setFsCollectionName(map.get("AA_FSCOLLECTIONNAME").toString());   //客户收款账号名称
 					  }
-					  if(map.get("AA_RECEIPTFORLOAN").toString() != null){
+					  if(map.get("AA_RECEIPTFORLOAN") != null){
 						  capitalSideLoanOther.setReceiptForLoan(Double.valueOf(map.get("AA_RECEIPTFORLOAN").toString()));  //借据余额（元）
 					  }
-					  if(Double.valueOf(map.get("AA_INTERESTPAYABLE").toString()) != null && Double.valueOf(map.get("AA_INTERESTPAYABLE").toString()) != 0){
+					  if(map.get("AA_INTERESTPAYABLE") != null){
 						  capitalSideLoanOther.setInterestPayable(Double.valueOf(map.get("AA_INTERESTPAYABLE").toString()));   //应还利息（元)
 					  }
-					  if(Integer.valueOf(map.get("AA_BEOVERDUE").toString()) != null && Integer.valueOf(map.get("AA_BEOVERDUE").toString()) != 0){
+					  if(map.get("AA_BEOVERDUE") != null){
 						  capitalSideLoanOther.setBeOverdue(Integer.valueOf(map.get("AA_BEOVERDUE").toString()));   //是否结清
 					  }
-					  if(Integer.valueOf(map.get("AA_SETTLE").toString()) != null && Integer.valueOf(map.get("AA_SETTLE").toString()) != 0){
+					  if(map.get("AA_SETTLE") != null ){
 						  capitalSideLoanOther.setSettle(Integer.valueOf(map.get("AA_SETTLE").toString()));   //是否结清
 				      }
-					  if(map.get("AA_APPLYDATE").toString() != null && map.get("AA_APPLYDATE").toString() != " "){
+					  if(map.get("AA_APPLYDATE") != null ){
 						  capitalSideLoanOther.setApplyDate(map.get("AA_APPLYDATE").toString());   //申请日期
 					  } 
-					  if(map.get("AA_PERSONINCHARGE").toString() != null){
+					  if(map.get("AA_PERSONINCHARGE") != null){
 						  capitalSideLoanOther.setPersonInCharge(map.get("AA_PERSONINCHARGE").toString());   //状态
 
 					  }
-					   if(Integer.valueOf(map.get("AA_B2BSTATUS").toString()) != null && Integer.valueOf(map.get("AA_B2BSTATUS").toString()) != 0){
+					   if(map.get("AA_B2BSTATUS") != null ){
 						   capitalSideLoanOther.setStatus(Integer.valueOf(map.get("AA_B2BSTATUS").toString()));  //状态
 
 					   }
-					  if(map.get("AA_APPROVALDATE").toString() != null ){
+					  if(map.get("AA_APPROVALDATE") != null ){
 						  capitalSideLoanOther.setApprovalDate(map.get("AA_APPROVALDATE").toString());  //审批人
 					  }
-					  if(map.get("AA_APPROVALMAN").toString() != null){
+					  if(map.get("AA_APPROVALMAN") != null){
 						  capitalSideLoanOther.setApprovalMan(map.get("AA_APPROVALMAN").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);
+					
+					    //req.setEnuu(10050877);
 					   req.setCapitalSideLoan(capitalSideLoanOther);
 					   Master ceuuMaster = ContextHolder.getMaster();
 				       //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
@@ -513,24 +527,7 @@ public class B2BInformation  extends AbstractTask{
 	            }
 			}
 		
-		   /* 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);
-		
-		    OpenCapitalSideRepaymentPlanOther.Builder capitalSideRepaymentPlanOther1 = OpenCapitalSideRepaymentPlanOther.newBuilder();
-		    capitalSideRepaymentPlanOther1.setRepaymentData("2020-3-25");
-		    capitalSideRepaymentPlanOther1.setCurrency("RMB");
-		    capitalSideRepaymentPlanOther1.setCapitalAmount(9891.2);
-		    capitalSideRepaymentPlanOther1.setInterest(4000);
-		    capitalSideRepaymentPlanOther1.setAmount(13891.2);
-		    capitalSideRepaymentPlanOther1.setPersonInCharge("lzx");
-		    req.addCapitalSideRepaymentPlan(capitalSideRepaymentPlanOther1);
-		    req.setEnuu(10050877);*/
+		   
 		
 		  //  AddCapitalSideLoanResp resp = capitalSideSdk.addCapitalSideLoan(req);
 		   // System.out.println(ProtoBufUtil.toJSON(resp));
@@ -547,6 +544,7 @@ public class B2BInformation  extends AbstractTask{
         +" 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_BACKDATE,AA_APPLYDATE,AA_B2BSTATUS from ACCOUNTAPPLY "
         +" where AA_UPLOADSTATUS = '待上传' order by aa_code) where rownum < 100");
+			System.out.println(maps);
 		 return maps;
 		}