金控接口调整

build.gradle

@@ -60,7 +60,7 @@ dependencies {
     compile "org.projectlombok:lombok:1.18.4"
     compile "commons-io:commons-io:2.6"
     compile "com.usoft.framework:usoft-security-utils:dev-1.0-SNAPSHOT"
-   	compile "usoft-sdk-fin:usoft-sdk-fin:3.0"
+   	compile "usoft-sdk-fin:usoft-sdk-fin:4.0"
     //compile "com.usoft:ufin:1.0.0:dependencies"
 }
 

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

@@ -104,14 +104,14 @@ public class B2BInformation  extends AbstractTask{
 						"	CQ_CODE,CQ_FACTORUU,CQ_FACTORNAME,CQ_CUSTCODE,CQ_CUSTUU,CQ_CUSTNAME," +
 						"	CQ_APPLYQUOTA,CQ_EFFECTDAYS,CQ_LENDRATE,CQ_ANNUALRATE,CQ_REPAYMENTMEANS," +
 						"	CQ_INDATE,CQ_RECORDER,CQ_RECORDERUU,CQ_AUDITDATE," +
-						"	CQ_STATUSCODE,CQ_STATUS,CQ_BASICEVALUATION,CQ_ISEFFECT,CQ_QUOTA,cq_assuremeans,cq_uinfo)" +
+						"	CQ_STATUSCODE,CQ_STATUS,CQ_BASICEVALUATION,CQ_ISEFFECT,CQ_QUOTA,cq_assuremeans,cq_uinfo,CQ_DEPOSITRATE)" +
 						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'" + (rest.getOfferQuoteInfo().getStatus() == 1401 ? "待上传" : "已上传") + "','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单'," +
 						"	'" + rest.getOfferQuoteInfo().getCode() + "'," + rest.getOfferQuoteInfo().getCsEnuu() + ",'" + rest.getOfferQuoteInfo().getCsEnName() + "',ONERP.CU_CODE," + rest.getOfferQuoteInfo().getFsEnuu() + ",'" + rest.getOfferQuoteInfo().getFsEnName() + "'," +
 						"	" + rest.getOfferQuoteInfo().getQuotaAmount()*10000 + "," + rest.getOfferQuoteInfo().getCredDays() + "," + rest.getOfferQuoteInfo().getFinanceRate() + "," + rest.getOfferQuoteInfo().getOfferRate() + ",'" + rest.getOfferQuoteInfo().getRepayment() + "'," +
 						"	TO_DATE('" + rest.getOfferQuoteInfo().getApplyTime() + "','YYYY-MM-DD hh24:mi:ss'),'" + rest.getOfferQuoteInfo().getApplyUsername() + "'," + rest.getOfferQuoteInfo().getApplyUu() + ",TO_DATE('" + rest.getOfferQuoteInfo().getCheckerTime() + "','YYYY-MM-DD hh24:mi:ss')," +
 						"	'" + (rest.getOfferQuoteInfo().getStatus() == 1402 || rest.getOfferQuoteInfo().getStatus() == 1403? "AUDITED" : "ENTERING") + "',"
 							+ "'" + (rest.getOfferQuoteInfo().getStatus() == 1402 || rest.getOfferQuoteInfo().getStatus() == 1403 ? "已审核" : "在录入") + "',"
-							+ "'" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount()*10000 + "','"+buf.toString()+"','"+rest.getOfferQuoteInfo().getGuarantorJson()+"')");
+							+ "'" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount()*10000 + "','"+buf.toString()+"','"+rest.getOfferQuoteInfo().getGuarantorJson()+"','"+rest.getOfferQuoteInfo().getDepositRate()+"')");
 				enMap.put("CQ_CODE",rest.getOfferQuoteInfo().getCode());
 				enMap.put("CQ_CUSTUU", rest.getOfferQuoteInfo().getFsEnuu());
 				enMap.put("CQ_FACTORUU", rest.getOfferQuoteInfo().getCsEnuu());
@@ -169,7 +169,9 @@ public class B2BInformation  extends AbstractTask{
                 Integer cqEffectdays = Integer.valueOf(map.get("CQ_EFFECTDAYS").toString());
 			    //当前额度
             	Double  cqQuota = Double.valueOf(map.get("CQ_QUOTA").toString())/10000;
-                
+            	
+            	//保证金比例
+            	Double depositrate = Double.valueOf(map.get("CQ_DEPOSITRATE").toString());
                 //融资比例
                 Double cqLendrate = Double.valueOf(map.get("CQ_LENDRATE").toString());
                 //年化利率
@@ -220,13 +222,14 @@ public class B2BInformation  extends AbstractTask{
 				SaveOfferQuotaInfoReq.Builder req = SaveOfferQuotaInfoReq.newBuilder();
 				req.setCsEnuu(cqFactoruu).setCsEnName("深圳市英唐保理有限公司").setFsEnuu(cqCustuu).setFsEnName(cqCustname).setQuotaAmount(cqQuota)
 						.setCredDays(cqEffectdays).setFinanceRate(cqLendrate).setOfferRate(cqAnnualrate).setRepayment(
-                        cqRepaymentmeans).setApplyUu(cqRecorderuu).setPreviousRecord("").setAcceptOfferQuotaCode(cqCode).addGuarantorJson(guarantorJson);
+                        cqRepaymentmeans).setApplyUu(cqRecorderuu).setPreviousRecord("")
+                        .setAcceptOfferQuotaCode(cqCode).addGuarantorJson(guarantorJson).setDepositRate(depositrate);
 				SaveOfferQuotaInfoResp resp = capitalSideSdk.saveOfferQuotaInfo(req);
                 String s = ProtoBufUtil.toJSON(resp);
                 JSONObject jsonObject = JSONObject.parseObject(s);
                 Object code = JSONObject.parseObject(jsonObject.get("respHeader").toString()).get("code");
 				Object msg = JSONObject.parseObject(jsonObject.get("respHeader").toString()).get("msg");
-                if ("0".equals(code.toString())||(msg!=null&&"您已经为该企业申请过报价额度，请不要重复申请".equals(msg.toString()))){
+                if ("0".equals(code.toString())||(msg!=null&&"您已经为该企业申请过报价额度，请不要重复申请！".equals(msg.toString()))){
 					UpdateOfferQuotaInfoReq.Builder builder = UpdateOfferQuotaInfoReq.newBuilder();
 					builder.setCsEnuu(cqFactoruu).setFsEnuu(cqCustuu).setStatus(cqApproval).setEndTime(cqEnddate)
 							.setCheckerContent(cqBasicevaluation).setCheckUu(cqRecorderuu);
@@ -253,7 +256,7 @@ public class B2BInformation  extends AbstractTask{
 	private List<Map<String, Object>> getCustomerQuotaUpload() {
 		List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from (select cq_id,cq_factoruu," +
                 "cq_custuu,cq_custname,cq_effectdays,cq_quota,cq_lendrate,cq_annualrate," +
-                "cq_repaymentmeans,cq_recorderuu,cq_approval,cq_enddate,cq_basicevaluation,cq_code,cq_uinfo from " +
+                "cq_repaymentmeans,cq_recorderuu,cq_approval,cq_enddate,cq_basicevaluation,cq_code,cq_uinfo,CQ_DEPOSITRATE from " +
                 "customerQuota where " +
 				"CQ_UPLOADSTATUS='待上传' and cq_status = '已审核' and cq_quotatype='卖方客户' order by cq_code ) where rownum " +
                 "< 100");

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

@@ -82,9 +82,9 @@ public class CustInfomationTask extends AbstractTask{
                     companyEnterpriseCrawlerList.getCompanyCourtNoticeList();
             sqls.addAll(get10Sqls(type,cuId,companyCourtNoticeList));
             //从表11  裁判文书   JUDGDOCUMENTS
-            List<CompanyJudgmentWritFinRest> companyJudgmentWritList =
+           /* List<CompanyJudgmentWritFinRest> companyJudgmentWritList =
                     companyEnterpriseCrawlerList.getCompanyJudgmentWritList();
-            sqls.addAll(get11Sqls(type,cuId,companyJudgmentWritList));
+            sqls.addAll(get11Sqls(type,cuId,companyJudgmentWritList));*/
             //从表12  开庭公告   COURTANNOUNCE
             List<CompanyOpenCourtNoticeFinRest> companyOpenCourtNoticeList =
                     companyEnterpriseCrawlerList.getCompanyOpenCourtNoticeList();

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

@@ -13,6 +13,7 @@ import com.uas.erp.schedular.task.support.Method;
 import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
 import com.usoft.fin.external.open.api.protobuf.*;
+import com.usoft.sdk.fin.client.BestsignSdk;
 import com.usoft.sdk.fin.client.CapitalSideSdk;
 
 import org.springframework.stereotype.Component;
@@ -29,6 +30,8 @@ import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferDetailsReq;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferDetailsResp;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferListReq;
 import com.usoft.fin.external.open.api.protobuf.GetFinanceOfferListResp;
+import com.usoft.fin.external.open.factoring.api.protobuf.GetBankAccountInfoReq;
+import com.usoft.fin.external.open.factoring.api.protobuf.GetBankAccountInfoResp;
 import com.usoft.sdk.fin.utils.ProtoBufUtil;
 
 @Component
@@ -36,7 +39,7 @@ import com.usoft.sdk.fin.utils.ProtoBufUtil;
 public class QuoteInfo  extends AbstractTask{
 	//private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
 	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.yitoa-fintech.com", "10046945", "600d3f07955ba67fe050007f01002db2");
-
+	private BestsignSdk bestsignSdk = new BestsignSdk("https://finrest.yitoa-fintech.com", "10046945", "600d3f07955ba67fe050007f01002db2");
 	  /**
 		* 上传放款信息
 		* @throws Exception
@@ -244,7 +247,7 @@ public class QuoteInfo  extends AbstractTask{
 		List<? extends FinanceOfferListOrBuilder> flist = resp.getFinanceOfferInfoOrBuilderList();
 		for(FinanceOfferListOrBuilder Finance :flist){
 			int status = 0;
-			if(Finance.getAcceptOfferInfo().getStatus() == 1003){   //如果报价实体状态为1003则融资实体也变更为1003
+			if(Finance.getAcceptOfferInfo().getStatus() == 1003){   //如果报价实体的融资状态为1003则融资实体状态也为1003
 				status = Finance.getAcceptOfferInfo().getStatus();
 			}else{
 				status = Finance.getFinanceDemandInfo().getStatus();
@@ -257,13 +260,13 @@ public class QuoteInfo  extends AbstractTask{
 		    +" 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)"
+		    +" CSUSERUU,CSUSERNAME,FINANCESIDENAME,FSCONTACTSMAN,FSCONTACTSPHONE,OFFERTIME,STATUS,PAYMENTS,OFFERRATE,FINANCINGRATIO,UPLOADSTATUS,DEPOSITAMOUNT)"
 		    + " values (AcceptOffer_seq.nextval,'"+Finance.getAcceptOfferInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getFinanceCode()+"','"+Finance.getAcceptOfferInfo().getOfferAmount()+"',"
 				+ "'"+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().getFinanceRate()+"',"
-			    + "'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"','待上传')");
+			    + "'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"','待上传','"+Finance.getAcceptOfferInfo().getDepositAmount()+"')");
 			//融资需求
 			sqlsDemand.add("MERGE INTO ACCEPTFINANCEDEMAND a"
 				    +" USING (SELECT nvl(max(id),0) ID from ACCEPTFINANCEDEMAND where code = '"+Finance.getFinanceDemandInfo().getCode()+"') b"
@@ -285,7 +288,6 @@ public class QuoteInfo  extends AbstractTask{
     				    + ",'"+Finance.getFinanceDemandInfo().getDealTime()+"','"+Finance.getFinanceDemandInfo().getOfferCount()+"','"+Finance.getFinanceDemandInfo().getFsDemandAmount()+"'"
     				    + ",'待上传')");
 			sqls.addAll(getFinanceOfferDetailsSqls(Finance.getAcceptOfferInfo().getCode()));
-			
 			//放款记录
 			if(Finance.getFinanceDemandInfo().getStatus() == 1002){
  				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
@@ -329,7 +331,10 @@ public class QuoteInfo  extends AbstractTask{
     				    + "null,null,null,null,"
     				    + "null,null,'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,'待上传',"
     				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null,null)");
+				//银行账号信息
+				sqlloand.addAll(getBankAccountInfo(Finance.getFinanceDemandInfo().getCode(),Finance.getAcceptOfferInfo().getCode()));
 			}
+			
 		}
         jdbcTemplate.batchExecute(sqls);  //报价信息
         jdbcTemplate.batchExecute(sqlsDemand);   //融资信息
@@ -377,5 +382,16 @@ public class QuoteInfo  extends AbstractTask{
 	}
 	return sqls;
 }
+    
+    //银行账号信息
+    public List<String> getBankAccountInfo(String DemandCode,String OfferCode) throws Exception {
+		GetBankAccountInfoReq.Builder req = GetBankAccountInfoReq.newBuilder();
+		req.setFinanceDemandCode(DemandCode).setAcceptOfferCode(OfferCode);
+		GetBankAccountInfoResp resp = bestsignSdk.getBankAccountInfo(req);
+		ArrayList<String> sqls = new ArrayList<>();
+		sqls.add("update AccountApply set aa_bank = '"+resp.getBankName()+"',aa_backbankno='"+resp.getBankAccount()+"',"
+				+ "aa_custaccount='"+resp.getBankAccountName()+"' where AA_FINANCEDEMANDCODE = '"+DemandCode+"'");
+		return sqls;
+	}
 }