Browse Source

调整默认账套,默认单据公司和单据类型

wuyx 5 năm trước cách đây
mục cha
commit
eceb0417f6

+ 14 - 10
src/main/java/com/uas/erp/schedular/finance/task/B2BInformation.java

@@ -12,7 +12,9 @@ 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;
@@ -52,10 +54,9 @@ import com.usoft.sdk.fin.utils.ProtoBufUtil;
 @Component
 @TaskMapping(title = "U智融对接服务", role = Role.SELLER)
 public class B2BInformation  extends AbstractTask{
-	
 	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
 	private TradingHallSdk tradingHallSdk = new TradingHallSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
-	
+
 	/**
      * 额度申请
      * @throws Exception
@@ -63,17 +64,18 @@ public class B2BInformation  extends AbstractTask{
 	@TaskMapping(title = "额度申请下载", fixedDelay = 360000, method = Method.DOWNLOAD)
     public void getOfferQuotaInfoList() throws Exception {
 		List<String> sqls = new ArrayList<>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Calendar beforeTime = Calendar.getInstance();
 		beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
 		Date beforeD = beforeTime.getTime();
+		Master currMaster = ContextHolder.getMaster();
     	GetOfferQuotaInfoListReq.Builder req = GetOfferQuotaInfoListReq.newBuilder();
-    	req.setCsEnuu(10042875);
+    	req.setCsEnuu(Integer.valueOf(currMaster.getMa_uu().toString()));
 		req.setPageNumber(1);
 		req.setPageSize(50);
 		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetOfferQuotaInfoListResp resp = capitalSideSdk.getOfferQuotaInfoList(req);
 		java.util.List<OfferQuotaInfoRest> restlist = resp.getOfferQuoteInfoList();
+		//System.out.println("restlist-size:"+restlist.size());
 		List<Map<String, Object>> enUUList = new ArrayList<>();
 		for(OfferQuotaInfoRest rest : restlist) {
 			Map<String, Object> enMap = new HashMap<>();
@@ -87,7 +89,7 @@ public class B2BInformation  extends AbstractTask{
 						"	FROM CustomerQuota WHERE CQ_CODE = '" + rest.getCode() + "' ) ONERP " +
 						"	ON (INERP.CQ_ID = ONERP.CQ_ID) " +
 						"	WHEN MATCHED THEN " +
-						"	UPDATE SET INERP.CQ_UPDATEDATE = SYSDATE,INERP.CQ_UPLOADSTATUS='已上传',INERP.CQ_QUOTATYPE='卖方客户'," +
+						"	UPDATE SET INERP.CQ_UPDATEDATE = SYSDATE,INERP.CQ_UPLOADSTATUS='已上传',INERP.CQ_QUOTATYPE='卖方客户',INERP.CQ_COP='"+currMaster.getMa_user()+"',INERP.CQ_CLASS='卖方客户申请单'," +
 						"	INERP.CQ_CUSTCODE = ONERP.CU_CODE," +
 						"	INERP.CQ_CUSTUU = " + rest.getFsEnuu() + ",INERP.CQ_CUSTNAME='" + rest.getFsEnName() + "'," +
 						"	INERP.CQ_APPLYQUOTA=" + rest.getQuotaAmount() + ",INERP.CQ_EFFECTDAYS=" + rest.getCredDays() + ",INERP.CQ_LENDRATE=" + rest.getFinanceRate() + "," +
@@ -97,11 +99,13 @@ public class B2BInformation  extends AbstractTask{
 						"	INERP.CQ_STATUS='" + (rest.getStatus() == 1402 ? "已审核" : "在录入") + "'," +
 						"	INERP.CQ_BASICEVALUATION='" + rest.getCheckerContent() + "'" +
 						"	WHEN NOT MATCHED THEN " +
-						"	INSERT (CQ_ID,CQ_UPLOADSTATUS,CQ_SOURCETYPE,CQ_QUOTATYPE,CQ_UPDATEDATE,CQ_CODE,CQ_FACTORUU,CQ_FACTORNAME,CQ_CUSTCODE,CQ_CUSTUU,CQ_CUSTNAME," +
+						"	INSERT (CQ_ID,CQ_UPLOADSTATUS,CQ_SOURCETYPE,CQ_QUOTATYPE,CQ_UPDATEDATE,CQ_COP,CQ_CLASS," +
+						"	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)" +
-						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'已上传','B2B','卖方客户',SYSDATE,'" + rest.getCode() + "'," + rest.getCsEnuu() + ",'" + rest.getCsEnName() + "',ONERP.CU_CODE," + rest.getFsEnuu() + ",'" + rest.getFsEnName() + "'," +
+						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'已上传','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单'," +
+						"	'" + rest.getCode() + "'," + rest.getCsEnuu() + ",'" + rest.getCsEnName() + "',ONERP.CU_CODE," + rest.getFsEnuu() + ",'" + rest.getFsEnName() + "'," +
 						"	" + rest.getQuotaAmount() + "," + rest.getCredDays() + "," + rest.getFinanceRate() + "," + rest.getOfferRate() + ",'" + rest.getRepayment() + "'," +
 						"	TO_DATE('" + rest.getApplyTime() + "','YYYY-MM-DD hh24:mi:ss'),'" + rest.getApplyUsername() + "'," + rest.getApplyUu() + ",TO_DATE('" + rest.getCheckerTime() + "','YYYY-MM-DD hh24:mi:ss')," +
 						"	'" + (rest.getStatus() == 1402 ? "AUDITED" : "ENTERING") + "','" + (rest.getStatus() == 1402 ? "已审核" : "在录入") + "','" + rest.getCheckerContent() + "')");
@@ -129,7 +133,7 @@ public class B2BInformation  extends AbstractTask{
 	public void getCustInfomation(List<Map<String, Object>> enUUList) throws Exception {
 		List<String> sqls = new ArrayList<>();
 		for(Map<String, Object> enMap : enUUList){
-			int facUU = enMap.get("CQ_FACTORUU") ==null ? 10042875 :Integer.valueOf(enMap.get("CQ_FACTORUU").toString());//资金方UU
+			int facUU = enMap.get("CQ_FACTORUU") ==null ? 10050877 :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);
@@ -186,7 +190,7 @@ public class B2BInformation  extends AbstractTask{
 						" WHERE CU_ENUU = "+custUU+" AND CU_STATUSCODE <> 'DISABLE'");
 				//从表1 高管信息 CUSTOMEREXCUTIVE
 				JSONArray enKeyPerList = JSONArray.parseArray(compBaseInfoByErmRest.getEnKeyPersonnel());
-				//System.out.println("更新高管信息:"+compBaseInfoByErmRest.getEnKeyPersonnel());
+				System.out.println("更新高管信息:"+compBaseInfoByErmRest.getEnKeyPersonnel());
 				if(enKeyPerList!=null && enKeyPerList.size()>0){
 					for(int ei = 0;ei < enKeyPerList.size();ei++){
 						JSONObject ek = enKeyPerList.getJSONObject(ei);
@@ -311,7 +315,7 @@ public class B2BInformation  extends AbstractTask{
 //				高管信息-担任职务	CUSTOMEREXCUTIVE.ce_position	enKeyPersonnel
 //enKeyPersonnel 数据格式:[{'陈亚荣': '总经理'}, {'陈正明': '执行董事'}, {'陈劲松': '监事'}]
 				JSONArray enKeyPerList = JSONArray.parseArray(compBaseInfoByErmRest.getEnKeyPersonnel());
-				//System.out.println("高管信息:"+compBaseInfoByErmRest.getEnKeyPersonnel());
+				System.out.println("高管信息:"+compBaseInfoByErmRest.getEnKeyPersonnel());
 				if(enKeyPerList!=null && enKeyPerList.size()>0){
 					for(int ei = 0;ei < enKeyPerList.size();ei++){
 						JSONObject ek = enKeyPerList.getJSONObject(ei);