Browse Source

放款信息上传

tanmh 6 years ago
parent
commit
62cb5281a2

+ 156 - 28
src/main/java/com/uas/erp/schedular/finance/task/B2BInformation.java

@@ -1,31 +1,24 @@
 package com.uas.erp.schedular.finance.task;
 package com.uas.erp.schedular.finance.task;
 
 
 
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
-
+import java.util.Locale;
 import com.uas.erp.schedular.task.support.Method;
 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.CapitalSideLoan;
 import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
 import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
 import com.usoft.fin.external.open.api.entity.OfferQuotaInfoRest;
 import com.usoft.fin.external.open.api.entity.OfferQuotaInfoRest;
 import com.usoft.fin.external.open.api.protobuf.*;
 import com.usoft.fin.external.open.api.protobuf.*;
 import com.usoft.sdk.fin.client.CapitalSideSdk;
 import com.usoft.sdk.fin.client.CapitalSideSdk;
-
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
-
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.TaskMapping;
 import com.uas.erp.schedular.task.support.TaskMapping;
-import com.usoft.fin.external.open.api.entity.AcceptFinanceDemand;
-import com.usoft.fin.external.open.api.entity.AcceptFinanceDemandDetail;
-import com.usoft.fin.external.open.api.entity.AcceptOffer;
-import com.usoft.fin.external.open.api.entity.CapitalSideLoan;
 import com.usoft.fin.external.open.api.entity.FinanceOfferDetails;
 import com.usoft.fin.external.open.api.entity.FinanceOfferDetails;
-import com.usoft.fin.external.open.api.entity.FinanceOfferList;
-import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
 import com.usoft.fin.external.open.api.entity.OfferDetailAndFinanceAccept;
 import com.usoft.fin.external.open.api.entity.OfferDetailAndFinanceAccept;
-import com.usoft.fin.external.open.api.entity.OfferQuotaInfoRest;
-import com.usoft.fin.external.open.api.protobuf.BatchOfferOrderReq;
-import com.usoft.fin.external.open.api.protobuf.BatchOfferOrderResp;
+import com.usoft.fin.external.open.api.entity.OpenCapitalSideLoanOther;
+import com.usoft.fin.external.open.api.entity.OpenCapitalSideRepaymentPlanOther;
 import com.usoft.fin.external.open.api.protobuf.GetCapitalSideLoanReq;
 import com.usoft.fin.external.open.api.protobuf.GetCapitalSideLoanReq;
 import com.usoft.fin.external.open.api.protobuf.GetCapitalSideLoanResp;
 import com.usoft.fin.external.open.api.protobuf.GetCapitalSideLoanResp;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferDetailsReq;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferDetailsReq;
@@ -34,11 +27,6 @@ import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferListReq;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferListResp;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferListResp;
 import com.usoft.fin.external.open.api.protobuf.GetOfferQuotaInfoListReq;
 import com.usoft.fin.external.open.api.protobuf.GetOfferQuotaInfoListReq;
 import com.usoft.fin.external.open.api.protobuf.GetOfferQuotaInfoListResp;
 import com.usoft.fin.external.open.api.protobuf.GetOfferQuotaInfoListResp;
-import com.usoft.fin.external.open.api.protobuf.GetOrderByOrderIdReq;
-import com.usoft.fin.external.open.api.protobuf.GetOrderByOrderIdResp;
-import com.usoft.fin.external.open.factoring.api.entity.FinanceDemandDetailAccept;
-import com.usoft.sdk.fin.client.CapitalSideSdk;
-import com.usoft.sdk.fin.client.TradingHallSdk;
 import com.usoft.sdk.fin.utils.ProtoBufUtil;
 import com.usoft.sdk.fin.utils.ProtoBufUtil;
 
 
 @Component
 @Component
@@ -46,12 +34,11 @@ import com.usoft.sdk.fin.utils.ProtoBufUtil;
 public class B2BInformation  extends AbstractTask{
 public class B2BInformation  extends AbstractTask{
 	
 	
 	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
 	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
-	 private TradingHallSdk tradingHallSdk = new TradingHallSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
 	
 	
-	/**
+/*	*//**
 	 * 下载放款记录列表
 	 * 下载放款记录列表
 	 * @throws Exception
 	 * @throws Exception
-	 */
+	 *//*
 	@TaskMapping(title = "放款记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
 	@TaskMapping(title = "放款记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
     public void getCapitalSideLoan() throws Exception {
     public void getCapitalSideLoan() throws Exception {
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqls = new ArrayList<>();
@@ -78,6 +65,55 @@ public class B2BInformation  extends AbstractTask{
         //System.out.println(sqls);
         //System.out.println(sqls);
         jdbcTemplate.batchExecute(sqls);
         jdbcTemplate.batchExecute(sqls);
        
        
+    }*/
+	
+	/**
+	 * 下载放款记录列表
+	 * @throws Exception
+	 */
+	@TaskMapping(title = "放款记录下载", fixedDelay = 360000, 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);
+        //Object venduu = baseDao.getFieldDataByCondition("Enterprise", "en_uu", "1=1");
+        //req.setCsEnuu(10050877);  //保理企业UU
+        req.setCsEnuu(10050877);    //优软商城企业UU com.usoft.fin.external.open.api.entity.
+        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("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);
+       
     }
     }
     
     
     /**
     /**
@@ -89,7 +125,7 @@ public class B2BInformation  extends AbstractTask{
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqlsDemand = new ArrayList<>();
     	final List<String> sqlsDemand = new ArrayList<>();
     	GetFinanceOfferListReq.Builder req = GetFinanceOfferListReq.newBuilder();
     	GetFinanceOfferListReq.Builder req = GetFinanceOfferListReq.newBuilder();
-		req.setEnuu(10042875);
+		req.setEnuu(10050877);
 		req.setPageNumber(1);
 		req.setPageNumber(1);
 		req.setPageSize(100);
 		req.setPageSize(100);
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
@@ -138,7 +174,7 @@ public class B2BInformation  extends AbstractTask{
     	
     	
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqls = new ArrayList<>();
     	GetOfferQuotaInfoListReq.Builder req = GetOfferQuotaInfoListReq.newBuilder();
     	GetOfferQuotaInfoListReq.Builder req = GetOfferQuotaInfoListReq.newBuilder();
-    	req.setCsEnuu(10042875);
+    	req.setCsEnuu(10050877);
 		req.setPageNumber(1);
 		req.setPageNumber(1);
 		req.setPageSize(100);
 		req.setPageSize(100);
 		GetOfferQuotaInfoListResp resp = capitalSideSdk.getOfferQuotaInfoList(req);
 		GetOfferQuotaInfoListResp resp = capitalSideSdk.getOfferQuotaInfoList(req);
@@ -148,8 +184,8 @@ public class B2BInformation  extends AbstractTask{
         			+ "APPLYUU,APPLYUSERNAME,CHECKERTIME,CHECKERUU,CHECKERUSERNAME,STATUS,CHECKERCONTENT,ID,CODE,UPLOADSTATUS) "
         			+ "APPLYUU,APPLYUSERNAME,CHECKERTIME,CHECKERUU,CHECKERUSERNAME,STATUS,CHECKERCONTENT,ID,CODE,UPLOADSTATUS) "
         			+ "values ('"+rest.getCsEnuu()+"','"+rest.getCsEnName()+"','"+rest.getFsEnuu()+"',"
         			+ "values ('"+rest.getCsEnuu()+"','"+rest.getCsEnName()+"','"+rest.getFsEnuu()+"',"
         					+ "'"+rest.getFsEnName()+"','"+rest.getQuotaAmount()+"','"+rest.getCredDays()+"','"+rest.getFinanceRate()+"',"
         					+ "'"+rest.getFsEnName()+"','"+rest.getQuotaAmount()+"','"+rest.getCredDays()+"','"+rest.getFinanceRate()+"',"
-        				    + "'"+rest.getOfferRate()+"','"+rest.getRepayment()+"','"+rest.getApplyTime()+"','"+rest.getApplyUu()+"',"
-        				    + "'"+rest.getApplyUsername()+"','"+rest.getCheckerTime()+"','"+rest.getCheckerUu()+"','"+rest.getCheckerUsername()+"',"
+        				    + "'"+rest.getOfferRate()+"','"+rest.getRepayment()+"',to_date('"+rest.getApplyTime()+"','yyyy-MM-dd HH24:mi:ss'),'"+rest.getApplyUu()+"',"
+        				    + "'"+rest.getApplyUsername()+"',to_date('"+rest.getCheckerTime()+"','yyyy-MM-dd HH24:mi:ss'),'"+rest.getCheckerUu()+"','"+rest.getCheckerUsername()+"',"
         				    + "'"+rest.getStatus()+"','"+rest.getCheckerContent()+"',OfferQuotaInfoRest_seq.nextval,'"+rest.getCode()+"','已上传')");
         				    + "'"+rest.getStatus()+"','"+rest.getCheckerContent()+"',OfferQuotaInfoRest_seq.nextval,'"+rest.getCode()+"','已上传')");
         }
         }
 		System.out.println(sqls);
 		System.out.println(sqls);
@@ -160,6 +196,7 @@ public class B2BInformation  extends AbstractTask{
     /**
     /**
      * 下载报价详情
      * 下载报价详情
      */
      */
+	@TaskMapping(title = "报价详情下载", fixedDelay = 360000, method = Method.DOWNLOAD)
 	public void getFinanceOfferDetails() throws Exception {
 	public void getFinanceOfferDetails() throws Exception {
 		final List<String> ordersqls = new ArrayList<>();   //订单详情
 		final List<String> ordersqls = new ArrayList<>();   //订单详情
 		final List<String> acceptsqls = new ArrayList<>();   //验收单详情
 		final List<String> acceptsqls = new ArrayList<>();   //验收单详情
@@ -173,19 +210,110 @@ public class B2BInformation  extends AbstractTask{
         			+ "ACCEPTAMOUNT,UPLOADSTATUS) "
         			+ "ACCEPTAMOUNT,UPLOADSTATUS) "
         			+ "values (ACCEPTFINANCEDEMANDDETAIL_seq.nextval,'"+rest.getFinanceDemandDetail().getCode()+"','"+rest.getFinanceDemandDetail().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetail().getCustEnuu()+"',"
         			+ "values (ACCEPTFINANCEDEMANDDETAIL_seq.nextval,'"+rest.getFinanceDemandDetail().getCode()+"','"+rest.getFinanceDemandDetail().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetail().getCustEnuu()+"',"
         					+ "'"+rest.getFinanceDemandDetail().getCustEnName()+"','"+rest.getFinanceDemandDetail().getCustGrade()+"','"+rest.getFinanceDemandDetail().getPayments()+"','"+rest.getFinanceDemandDetail().getOrderId()+"',"
         					+ "'"+rest.getFinanceDemandDetail().getCustEnName()+"','"+rest.getFinanceDemandDetail().getCustGrade()+"','"+rest.getFinanceDemandDetail().getPayments()+"','"+rest.getFinanceDemandDetail().getOrderId()+"',"
-        				    + "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传'");
+        				    + "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");
 		
 		
+			 String formats = "yyyy-MM-dd HH:mm:ss";
+			 Long timestamp = Long.parseLong(rest.getFinanceDemandDetailAccept().getAcceptDate());
+		     String date = new SimpleDateFormat(formats, Locale.CHINA).format(new Date(timestamp));
 			acceptsqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
 			acceptsqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
         			+ "ACCEPTSTATUS,TITLE,SPEC,PRODUCTCODE,STATUS,UPLOADSTATUS) "
         			+ "ACCEPTSTATUS,TITLE,SPEC,PRODUCTCODE,STATUS,UPLOADSTATUS) "
         			+ "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
         			+ "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
-        			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptAmount()+"','"+rest.getFinanceDemandDetailAccept().getAcceptDate()+"',"
-        		    + "'"+rest.getFinanceDemandDetailAccept().getAcceptCode()+"','"+rest.getFinanceDemandDetailAccept().getAcceptStatus()+"','"+rest.getFinanceDemandDetailAccept().getTitle()+"','"+rest.getFinanceDemandDetailAccept().getSpec()+"','"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传'");
+        			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptAmount()+"',to_date('"+date+"','yyyy-mm-dd hh24:mi:ss'),"
+        		    + "'"+rest.getFinanceDemandDetailAccept().getAcceptCode()+"','"+rest.getFinanceDemandDetailAccept().getAcceptStatus()+"','"+rest.getFinanceDemandDetailAccept().getTitle()+"','"+rest.getFinanceDemandDetailAccept().getSpec()+"','"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传')");
 		}
 		}
-		System.out.println(ordersqls);
+		System.out.println(acceptsqls);
 		jdbcTemplate.batchExecute(ordersqls);
 		jdbcTemplate.batchExecute(ordersqls);
 		
 		
 		jdbcTemplate.batchExecute(acceptsqls);
 		jdbcTemplate.batchExecute(acceptsqls);
 	}
 	}
+	
+	
+	   /**
+	* 上传放款信息
+	* @throws Exception
+	*/
+	public void addCapitalSideLoan() throws Exception  {
+	    AddCapitalSideLoanReq.Builder req = AddCapitalSideLoanReq.newBuilder();
+	    OpenCapitalSideLoanOther.Builder capitalSideLoanOther = OpenCapitalSideLoanOther.newBuilder();
+	    List<CapitalSideLoan> capitalSideLoan = jdbcTemplate.queryForBeanList("select * from ACCOUNTAPPLY where AA_UPLOADSTATUS = '待上传' or AA_UPLOADSTATUS = '上传中'",
+        		CapitalSideLoan.class);
+	    
+	    for(CapitalSideLoan capi :capitalSideLoan){
+	    	
+		    capitalSideLoanOther.setFinanceDemandCode(capi.getFinanceDemandCode());
+		    capitalSideLoanOther.setLoanCode(capi.getLoanCode());
+		    capitalSideLoanOther.setReceivablesArrivalDate(capi.getReceivablesArrivalDate());
+		    capitalSideLoanOther.setFinanceRate(capi.getFinanceRate());
+		    capitalSideLoanOther.setLoanAmount(capi.getLoanAmount());
+		    capitalSideLoanOther.setLoanDate(capi.getLoanDate());
+		    capitalSideLoanOther.setRepaymentData(capi.getRepaymentData());
+		    capitalSideLoanOther.setLoanRate(capi.getLoanRate());
+		    capitalSideLoanOther.setRepaymentFrequency(capi.getRepaymentFrequency());
+		    capitalSideLoanOther.setFsCollectionBank(capi.getFsCollectionBank());
+		    capitalSideLoanOther.setFsCollectionAccount(capi.getFsCollectionAccount());
+		    capitalSideLoanOther.setFsCollectionName(capi.getFsCollectionName());
+		    capitalSideLoanOther.setReceiptForLoan(capi.getReceiptForLoan());
+		    capitalSideLoanOther.setInterestPayable(capi.getInterestPayable());
+		    capitalSideLoanOther.setBeOverdue(capi.getBeOverdue());
+		    capitalSideLoanOther.setSettle(capi.getSettle());
+		    capitalSideLoanOther.setApplyDate(capi.getApplyDate());
+		    capitalSideLoanOther.setPersonInCharge(capi.getPersonInCharge());
+		    capitalSideLoanOther.setStatus(capi.getStatus());
+		    capitalSideLoanOther.setApprovalDate(capi.getApprovalDate());
+		    capitalSideLoanOther.setApprovalMan(capi.getApprovalMan());
+		    req.setCapitalSideLoan(capitalSideLoanOther);
+	    	
+	    }
+	    
+	    
+
+	
+	    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));
+	}
+	
+  /*  private List<CapitalSideLoan> getPurchasesUpload() {
+        List<CapitalSideLoan> purchases = jdbcTemplate.queryForBeanList("select * from (select purchase.*,em_uu,em_name,em_sex,em_mobile,em_email,vendor.ve_uu,pu_vendcontact ve_contact,purchase.pu_vendcontactuu ve_contactuu from purchase left join vendor on pu_vendcode=ve_code left join employee on pu_buyerid=em_id where (PU_SENDSTATUS='待上传' or PU_SENDSTATUS='上传中') and pu_statuscode='AUDITED' and nvl(pu_ordertype,' ')<>'B2C' and coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 and not exists (select 1 from purchasedetail,product where pd_puid=pu_id and pr_code=pd_prodcode and pr_sendstatus<>'已上传') order by pu_code) where rownum < 100",
+        		CapitalSideLoan.class);
+        List<Purchase> thisPost = new ArrayList<>();
+        int count = 0;
+        for (Purchase purchase : purchases) {
+            List<PurchaseDetail> purchaseDetails = jdbcTemplate.queryForBeanList("select * from (select p.*,product.pr_oldcode ,product.pr_oldname,product.pr_oldspec,(select max(pv_vendprodspec) from productvendor where pv_prodcode=pd_prodcode and pv_vendcode=?) as pd_vendspec from purchasedetail p left join product on pr_code=pd_prodcode where pd_puid=?)",
+                    PurchaseDetail.class, purchase.getPu_vendcode(), purchase.getPu_id());
+            if (!CollectionUtils.isEmpty(purchaseDetails)) {
+                for(PurchaseDetail detail : purchaseDetails) {
+                    if (StringUtils.hasText(detail.getPd_prattach())) {
+                        detail.setAttaches(getAttachs(detail.getPd_prattach().split(";")));
+                    }
+                }
+            }
+            purchase.setPurchaseDetails(purchaseDetails);
+            thisPost.add(purchase);
+            if ((count = count + purchaseDetails.size()) >= DATA_SIZE_LIMIT) {
+                break;
+            }
+        }
+        return thisPost;
+    }*/
 }
 }
 
 
 
 

+ 9 - 1
src/test/java/com/uas/erp/test/SdkTest.java

@@ -37,7 +37,7 @@ public class SdkTest extends AbstractTask {
          master.setMa_user("YITOA_BL");
          master.setMa_user("YITOA_BL");
          ContextHolder.setMaster(master);
          ContextHolder.setMaster(master);
 		 b2BInformation.getOfferQuotaInfoList();
 		 b2BInformation.getOfferQuotaInfoList();
-	 }
+	 }	
 	 @Test
 	 @Test
 	 public void getFinanceOfferList() throws Exception{
 	 public void getFinanceOfferList() throws Exception{
 		 Master master = new Master();
 		 Master master = new Master();
@@ -54,6 +54,14 @@ public class SdkTest extends AbstractTask {
 		 b2BInformation.getFinanceOfferDetails();
 		 b2BInformation.getFinanceOfferDetails();
 	 }
 	 }
 	 
 	 
+	 @Test
+	 public void addCapitalSideLoan() throws Exception  {
+		 Master master = new Master();
+         master.setMa_user("YITOA_BL");
+         ContextHolder.setMaster(master);
+		 b2BInformation.addCapitalSideLoan();
+	 }
+