tanmh před 6 roky
rodič
revize
580faa8935

+ 13 - 9
src/main/java/com/uas/erp/schedular/finance/task/B2BInformation.java

@@ -143,7 +143,8 @@ public class B2BInformation  extends AbstractTask{
 //			System.out.println("facUU:"+facUU);
 //			System.out.println("custUU:"+custUU);
 			GetEnterpriseExtensionInfoReq.Builder entExtReq = GetEnterpriseExtensionInfoReq.newBuilder();
-			entExtReq.setEnuu(custUU);
+			//entExtReq.setEnuu(custUU);  //正式
+			entExtReq.setEnuu(10050877);    //测试
 			//客户基本信息 CompanyBasicInfosByErmRest
 			GetEnterpriseExtensionInfoResp entExtInfoResp = tradingHallSdk.getEnterpriseExtensionInfo(entExtReq);
 			CompanyBasicInfosByErmRest compBaseInfoByErmRest = entExtInfoResp.getCompanyBasicInfo();
@@ -163,7 +164,8 @@ public class B2BInformation  extends AbstractTask{
 			//资金方UU  为空或为0默认保理
 			req.setCsEnuu(facUU);
 			//融资方UU
-			req.setEnuu(custUU);
+			req.setEnuu(10050877);
+			//req.setEnuu(custUU);
 			//操作人UU 为空就为0
 			req.setUu(userUU);
 			GetBaseInfoResp restBaseInfoResp = tradingHallSdk.getBaseInfo(req);
@@ -495,7 +497,8 @@ public class B2BInformation  extends AbstractTask{
 					  }
 					   req.setCapitalSideLoan(capitalSideLoanOther);
 					   Master ceuuMaster = ContextHolder.getMaster();
-				       req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
+				       //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
+					   req.setEnuu(10050877);
 					 AddCapitalSideLoanResp resp = capitalSideSdk.addCapitalSideLoan(req);
 					 System.out.println(resp);
 	                String s = ProtoBufUtil.toJSON(resp);
@@ -664,13 +667,14 @@ public class B2BInformation  extends AbstractTask{
     	final List<String> sqlloand = new ArrayList<>();
     	GetFinanceOfferListReq.Builder req = GetFinanceOfferListReq.newBuilder();
     	Master ceuuMaster = ContextHolder.getMaster();
-        req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
+        //req.setEnuu(Integer.valueOf(ceuuMaster.getMa_uu().toString()));
+    	req.setEnuu(10050877);
 		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分钟更新的单据列表
+		Calendar beforeTime = Calendar.getInstance();
+		beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
+		Date beforeD = beforeTime.getTime();
+		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
 		List<? extends FinanceOfferListOrBuilder> flist = resp.getFinanceOfferInfoOrBuilderList();
 		for(FinanceOfferListOrBuilder Finance :flist){
@@ -738,7 +742,7 @@ public class B2BInformation  extends AbstractTask{
 	        			+ "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,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
-    			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,sysdate,null,null,'ENTERING',null,null,null,null,null"
+    			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',sysdate,null,sysdate,null,null,'ENTERING',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,null,null,null,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getCode()+"',"
     					+ "'"+aaCode+"','"+Finance.getAcceptOfferInfo().getCsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnName()+"',"

+ 2 - 2
src/test/java/com/uas/erp/test/SdkTest.java

@@ -28,7 +28,7 @@ public class SdkTest extends AbstractTask {
 	 public void downOfferQuotaInfoList() throws Exception{
 		 Master master = new Master();
          master.setMa_user("YITOA_BL");
-         master.setMa_uu(10050877L);
+        // master.setMa_uu(10050877L);
          ContextHolder.setMaster(master);
 		 b2BInformation.getOfferQuotaInfoList();
 	 }	
@@ -36,7 +36,7 @@ public class SdkTest extends AbstractTask {
 	 public void getFinanceOfferList() throws Exception{
 		 Master master = new Master();
          master.setMa_user("YITOA_BL");
-         master.setMa_uu(10050877L);
+         //master.setMa_uu(10050877L);
          ContextHolder.setMaster(master);
 		 b2BInformation.getFinanceOfferList();
 	 }