erp与u智融对接接口切换成正式

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

@@ -14,6 +14,7 @@ import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.fin.external.open.api.entity.*;
 import com.usoft.fin.external.open.api.protobuf.*;
 import com.usoft.sdk.fin.client.CapitalSideSdk;
+import com.usoft.sdk.fin.client.TradingHallSdk;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,8 +31,8 @@ import com.usoft.sdk.fin.utils.ProtoBufUtil;
 public class B2BInformation  extends AbstractTask{
 	@Autowired
 	private CustInfomationTask custInfomationTask;
-	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
-
+	//private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10046945", "b78d577449b64f56a8a6cf1feeb3fbf5");
+	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.yitoa-fintech.com", "10046945", "600d3f07955ba67fe050007f01002db2");
 	/**
      * 额度申请
      * @throws Exception
@@ -48,7 +49,7 @@ public class B2BInformation  extends AbstractTask{
 		Object lastTime = jdbcTemplate.getObject("SELECT MAX(DATA) FROM CONFIGS WHERE CALLER = 'sys' AND CODE ='lastLoadQuotaTime'");
 		Master currMaster = ContextHolder.getMaster();
     	GetOfferQuotaInfoListReq.Builder req = GetOfferQuotaInfoListReq.newBuilder();
-    	req.setCsEnuu(10050877); //req.setCsEnuu(Integer.valueOf(currMaster.getMa_uu().toString()));
+    	req.setCsEnuu(10046945); //req.setCsEnuu(Integer.valueOf(currMaster.getMa_uu().toString()));
 		if(lastTime != null){//未配置则取全部数据
 			long lt = Long.valueOf(String.valueOf(lastTime));
 			System.out.println("lt:"+lt);
@@ -201,11 +202,11 @@ public class B2BInformation  extends AbstractTask{
 					    capitalSideRepaymentPlanOther.setPersonInCharge("lzx");
 					    req.addCapitalSideRepaymentPlan(capitalSideRepaymentPlanOther);
 					
-					    //req.setEnuu(10050877);
+					    //req.setEnuu(10046945);
 					   req.setCapitalSideLoan(capitalSideLoanOther);
 					   Master ceuuMaster = ContextHolder.getMaster();
 				       //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
-					   req.setEnuu(10050877);
+					   req.setEnuu(10046945);
 					 AddCapitalSideLoanResp resp = capitalSideSdk.addCapitalSideLoan(req);
 					 System.out.println(resp);
 	                String s = ProtoBufUtil.toJSON(resp);
@@ -253,7 +254,7 @@ public class B2BInformation  extends AbstractTask{
 			for (Map<String, Object> map:customerQuotaUpload) {
                 //资金方UU
                 Object cq_factoruu = map.get("CQ_FACTORUU");
-                Integer cqFactoruu =10050877;
+                Integer cqFactoruu =10046945;
                 //Integer cqFactoruu =10046945; //线上
                 if (cq_factoruu!=null) {
                    cqFactoruu = Integer.valueOf(cq_factoruu.toString());
@@ -359,7 +360,7 @@ public class B2BInformation  extends AbstractTask{
     	GetFinanceOfferListReq.Builder req = GetFinanceOfferListReq.newBuilder();
     	Master ceuuMaster = ContextHolder.getMaster();
         //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
-    	req.setEnuu(10050877);
+    	req.setEnuu(10046945);
 		req.setPageNumber(1);
 		req.setPageSize(100);
 		Calendar beforeTime = Calendar.getInstance();

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

@@ -10,8 +10,10 @@ import com.usoft.fin.external.open.api.protobuf.GetBaseInfoReq;
 import com.usoft.fin.external.open.api.protobuf.GetBaseInfoResp;
 import com.usoft.fin.external.open.api.protobuf.GetEnterpriseExtensionInfoReq;
 import com.usoft.fin.external.open.api.protobuf.GetEnterpriseExtensionInfoResp;
+import com.usoft.sdk.fin.client.CapitalSideSdk;
 import com.usoft.sdk.fin.client.TradingHallSdk;
 import com.usoft.sdk.fin.utils.ProtoBufUtil;
+
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
@@ -21,8 +23,9 @@ import java.util.*;
 @Component
 @TaskMapping(title = "U智融对接服务", role = Role.SELLER)
 public class CustInfomationTask extends AbstractTask{
-    private TradingHallSdk tradingHallSdk = new TradingHallSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
-    /**
+    //private TradingHallSdk tradingHallSdk = new TradingHallSdk("https://finrest.uuzcc.cn", "10046945", "b78d577449b64f56a8a6cf1feeb3fbf5");
+	private TradingHallSdk tradingHallSdk = new TradingHallSdk("https://finrest.yitoa-fintech.com", "10046945", "600d3f07955ba67fe050007f01002db2");
+	/**
      * 客户信息下载
      * @param enUUList
      * @throws Exception
@@ -33,7 +36,7 @@ public class CustInfomationTask extends AbstractTask{
             int custUU = Integer.valueOf(enMap.get("CQ_CUSTUU").toString());//融资方UU--客户
             //客户基本信息 CompanyBasicInfosByErmRest
             GetEnterpriseExtensionInfoReq.Builder entExtReq = GetEnterpriseExtensionInfoReq.newBuilder();
-            entExtReq.setEnuu(custUU);  //正式   测试 entExtReq.setEnuu(10050877);
+            entExtReq.setEnuu(custUU);  //正式   测试 entExtReq.setEnuu(10046945);
             GetEnterpriseExtensionInfoResp entExtInfoResp = tradingHallSdk.getEnterpriseExtensionInfo(entExtReq);
             CompanyBasicInfosByErmRest compBaseInfoByErmRest = entExtInfoResp.getCompanyBasicInfo();
             if(compBaseInfoByErmRest.getEnName()==null||compBaseInfoByErmRest.getEnName().equals("")){
@@ -60,7 +63,7 @@ public class CustInfomationTask extends AbstractTask{
             sqls.addAll(getFourSqls(type,cuId,compBaseInfoByErmRest.getEnChangingRecords()));
             //从表5 客户财务报表 CUSTOMERFINANCIAL
             sqls.addAll(getFiveSqls(type,cuId,entExtInfoResp.getErpDataInfo()));
-            //从表6 经营信息 MANAGEMENTINFO ErpPurchaseInfo ErpSaleInfo
+            //从表6 经营信息 MANAGEMENTINFO ErpPurchaseInfo ErpSaleInfo 
             sqls.addAll(getSixSqls(type,cuId,entExtInfoResp.getErpDataInfo()));
             //从表7 上下游信息 UPDOWNINFO
             sqls.addAll(getSevenSqls(type,cuId,entExtInfoResp.getErpDataInfo()));
@@ -653,7 +656,7 @@ public class CustInfomationTask extends AbstractTask{
     //主表 CUSTOMERINFOR SQL
     private List<String> getMainSqls(String type,int cuId,String cuCode,Map<String, Object> enMap,GetEnterpriseExtensionInfoResp entExtInfoResp) throws Exception{
         ArrayList<String> sqls = new ArrayList<>();
-        int facUU = enMap.get("CQ_FACTORUU") ==null ? 10050877 :Integer.valueOf(enMap.get("CQ_FACTORUU").toString());//资金方UU
+        int facUU = enMap.get("CQ_FACTORUU") ==null ? 10046945 :Integer.valueOf(enMap.get("CQ_FACTORUU").toString());//资金方UU
         int custUU = Integer.valueOf(enMap.get("CQ_CUSTUU").toString());//融资方UU--客户
         int userUU = enMap.get("CQ_RECORDERUU") ==null ? 0 :Integer.valueOf(enMap.get("CQ_RECORDERUU").toString());//操作人UU
         //System.out.println("facUU:"+facUU+","+custUU:"+custUU);
@@ -689,7 +692,7 @@ public class CustInfomationTask extends AbstractTask{
                     "'"+entCrawLFRest.getConTheTaxCredit()+"','"+compBaseInfoByErmRest.getEnRegStatus()+"','"+compBaseInfoByErmRest.getEnOpRange()+"','"+restBaseInfo.getEnBusinessMain()+"',"+
                     "'"+restBaseInfo.getFsContactsMan()+"','"+restBaseInfo.getFsContactsPhone()+"','"+cu_regcapital+
                     "','"+cu_paidincapital+"','"
-                    +compBaseInfoByErmRest.getEnRegLocation()+"','"+restBaseInfo.getEnAddress()+"','"+compLawInfoRest.getEnIntro()+"',"+cu_employeesnum+",'10050877')");
+                    +compBaseInfoByErmRest.getEnRegLocation()+"','"+restBaseInfo.getEnAddress()+"','"+compLawInfoRest.getEnIntro()+"',"+cu_employeesnum+",'10046945')");
             sqls.add("UPDATE CUSTOMERQUOTA SET cq_custcode ='"+cuCode+"' where cq_custcode is null and CQ_CUSTUU = "+custUU);
         }else {
             sqls.add("UPDATE CUSTOMERQUOTA SET CQ_CUSTCODE = (SELECT CU_CODE FROM CUSTOMERINFOR WHERE CU_ID = "+cuId+") where CQ_CUSTCODE is null and CQ_CUSTUU = "+custUU);
@@ -700,7 +703,7 @@ public class CustInfomationTask extends AbstractTask{
                     " CU_LICENSEDATE = "+cu_licensedate+",CU_PAPERSCODE='"+compBaseInfoByErmRest.getEnCodeCrawled()+"'," +
                     " CU_TAXCREDIT ='"+entCrawLFRest.getConTheTaxCredit()+"',CU_REGISTSTATUS='"+compBaseInfoByErmRest.getEnRegStatus()+"',CU_BUSINSSCOPE='"+compBaseInfoByErmRest.getEnOpRange()+"',CU_BUSINESSMAIN='"+restBaseInfo.getEnBusinessMain()+"'," +
                     " CU_CONTACT='"+restBaseInfo.getFsContactsMan()+"',CU_CONTACTNUM='"+restBaseInfo.getFsContactsPhone()+"',CU_REGCAPITAL='"+cu_regcapital+"',CU_PAIDINCAPITAL='"+cu_paidincapital+"'," +
-                    " CU_REGADD='"+compBaseInfoByErmRest.getEnRegLocation()+"',CU_OFFICEADD='"+restBaseInfo.getEnAddress()+"',CU_INTRODUCTION='"+compLawInfoRest.getEnIntro()+"',CU_ZJUU='"+10050877+"'," +
+                    " CU_REGADD='"+compBaseInfoByErmRest.getEnRegLocation()+"',CU_OFFICEADD='"+restBaseInfo.getEnAddress()+"',CU_INTRODUCTION='"+compLawInfoRest.getEnIntro()+"',CU_ZJUU='"+10046945+"'," +
                     " CU_EMPLOYEESNUM=" +cu_employeesnum+
                     " WHERE CU_ENUU = "+custUU+" AND CU_STATUSCODE <> 'DISABLE'");
         }

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

@@ -4,57 +4,38 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.erp.schedular.entity.Master;
 import com.uas.erp.schedular.task.support.Method;
 import com.uas.erp.schedular.util.ContextHolder;
-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.OfferQuotaInfoRest;
 import com.usoft.fin.external.open.api.protobuf.*;
 import com.usoft.sdk.fin.client.CapitalSideSdk;
-import com.usoft.sdk.fin.client.TradingHallSdk;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.descriptor.web.ContextHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.TaskMapping;
-import com.uas.erp.schedular.util.CollectionUtil;
-import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.fin.external.open.api.entity.AcceptOfferDetail;
-import com.usoft.fin.external.open.api.entity.CompanyBasicInfosByErmRest;
-import com.usoft.fin.external.open.api.entity.CompanyEnterpriseCrawlerListFinRest;
-import com.usoft.fin.external.open.api.entity.CompanyIndustryAndCommerceInfoRest;
-import com.usoft.fin.external.open.api.entity.CompanyLawInfoFinRest;
 import com.usoft.fin.external.open.api.entity.FinanceOfferDetails;
 import com.usoft.fin.external.open.api.entity.OfferDetailAndFinanceAccept;
 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.entity.RestBaseInfo;
-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.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.api.protobuf.GetOfferQuotaInfoListReq;
-import com.usoft.fin.external.open.api.protobuf.GetOfferQuotaInfoListResp;
 import com.usoft.sdk.fin.utils.ProtoBufUtil;
 
 @Component
 @TaskMapping(title = "U智融对接服务", role = Role.SELLER)
 public class QuoteInfo  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 CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.yitoa-fintech.com", "10046945", "600d3f07955ba67fe050007f01002db2");
 
 	  /**
 		* 上传放款信息
@@ -205,7 +186,7 @@ public class QuoteInfo  extends AbstractTask{
 					   req.setCapitalSideLoan(capitalSideLoanOther);
 					   Master ceuuMaster = ContextHolder.getMaster();
 				       //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
-					   req.setEnuu(10050877);
+					   req.setEnuu(10046945);
 					 AddCapitalSideLoanResp resp = capitalSideSdk.addCapitalSideLoan(req);
 					 System.out.println(resp);
 	                String s = ProtoBufUtil.toJSON(resp);
@@ -220,8 +201,6 @@ public class QuoteInfo  extends AbstractTask{
 	            }
 			}
 		
-		   
-		
 		  //  AddCapitalSideLoanResp resp = capitalSideSdk.addCapitalSideLoan(req);
 		   // System.out.println(ProtoBufUtil.toJSON(resp));
 		}
@@ -256,14 +235,14 @@ public class QuoteInfo  extends AbstractTask{
     	GetFinanceOfferListReq.Builder req = GetFinanceOfferListReq.newBuilder();
     	Master ceuuMaster = ContextHolder.getMaster();
         //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
-    	req.setEnuu(10050877);
+    	req.setEnuu(10046945);
 		req.setPageNumber(1);
 		req.setPageSize(100);
-		//Calendar beforeTime = Calendar.getInstance();
-		//beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
-		//Date beforeD = beforeTime.getTime();
-		//req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
-		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
+		/*Calendar beforeTime = Calendar.getInstance();
+		beforeTime.add(Calendar.MINUTE, -7);// 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){
@@ -274,7 +253,6 @@ public class QuoteInfo  extends AbstractTask{
 				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"
 		    +" ON (ao.ID = b.ID)"
@@ -358,24 +336,19 @@ public class QuoteInfo  extends AbstractTask{
 		}
         jdbcTemplate.batchExecute(sqls);  //报价信息
         jdbcTemplate.batchExecute(sqlsDemand);   //融资信息
-        System.out.println(sqlloand);
         jdbcTemplate.batchExecute(sqlloand);   //放款信息
 	}
 	//报价详情
     public List<String> getFinanceOfferDetailsSqls(String OfferCode) throws Exception{
 	List<String> sqls = new ArrayList<String>();
 	GetFinanceOfferDetailsReq.Builder req = GetFinanceOfferDetailsReq.newBuilder();
-	//System.out.println("OfferCode："+OfferCode);
 	req.setOfferCode(OfferCode);
 	GetFinanceOfferDetailsResp resp = capitalSideSdk.getFinanceOfferDetails(req);
 	FinanceOfferDetails adetaillist =  resp.getFinanceOfferInfo();
 	List<OfferDetailAndFinanceAccept> restlist = adetaillist.getOfferDetailAndFinanceAcceptInfoList();
-	//System.out.println("从表1："+restlist.size());
-	//System.out.println("从表1："+restlist.toString());
 	for(OfferDetailAndFinanceAccept rest :restlist){
 		//报价明细
 		int offerDetailCount = jdbcTemplate.count(" from acceptOfferDetail where acceptOfferCode =?",OfferCode);
-		//System.out.println("acceptOfferDetail："+offerDetailCount);
 		if(offerDetailCount == 0){
 			AcceptOfferDetail acceptOfferDetail = rest.getAcceptOfferDetail();
 			sqls.add("insert into acceptOfferDetail(id_,MIANcode,acceptOfferCode,financeDemandDetailCode,financeDemandDetailAcceptCode,offerAmount) "
@@ -385,7 +358,6 @@ public class QuoteInfo  extends AbstractTask{
 		}
 		//融资需求与B2B订单信息
 		int accepDetailCount = jdbcTemplate.count(" from ACCEPTFINANCEDEMANDDETAIL where FINANCEDEMANDCODE =?",rest.getFinanceDemandDetail().getFinanceDemandCode());
-		//System.out.println("ACCEPTFINANCEDEMANDDETAIL："+accepDetailCount);
 		if(accepDetailCount == 0){
 			sqls.add("insert into ACCEPTFINANCEDEMANDDETAIL(ID,CODE,FINANCEDEMANDCODE,CUSTENUU,CUSTENNAME,CUSTGRADE,PAYMENTS,ORDERID,ORDERCODE,ORDERTOTAL,"
 					+ "ACCEPTAMOUNT,UPLOADSTATUS) "
@@ -395,7 +367,6 @@ public class QuoteInfo  extends AbstractTask{
 		}
 		 //融资需求与B2B验收单信息单详情
 		int accepDetCount = jdbcTemplate.count(" from FINANCEDEMANDDETAILACCEPT where FINANCEDEMANDCODE =?",rest.getFinanceDemandDetailAccept().getFinanceDemandCode());
-		//System.out.println("FINANCEDEMANDDETAILACCEPT："+accepDetCount);
 		if(accepDetCount == 0){
 			sqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
         			+ "ACCEPTSTATUS,TITLE,SPEC,PRODUCTCODE,STATUS,UPLOADSTATUS) "