定时时间修改

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

@@ -28,6 +28,7 @@ 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.CompanyBasicInfosByErmRest;
 import com.usoft.fin.external.open.api.entity.CompanyEnterpriseCrawlerListFinRest;
@@ -63,7 +64,7 @@ public class B2BInformation  extends AbstractTask{
      * 额度申请
      * @throws Exception
      */
-	@TaskMapping(title = "额度申请下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "额度申请下载", fixedDelay = 30000, method = Method.DOWNLOAD)
     public void getOfferQuotaInfoList() throws Exception {
 		List<String> sqls = new ArrayList<>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -413,7 +414,7 @@ public class B2BInformation  extends AbstractTask{
 	 * 下载放款记录列表
 	 * @throws Exception
 	 */
-	@TaskMapping(title = "放款记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "放款记录下载", fixedDelay = 30000, method = Method.DOWNLOAD)
     public void getCapitalSideLoan() throws Exception {
 		final List<String> sqls = new ArrayList<>();
         GetCapitalSideLoanReq.Builder req = GetCapitalSideLoanReq.newBuilder();
@@ -507,7 +508,7 @@ public class B2BInformation  extends AbstractTask{
      * 报价记录下载
      * @throws Exception
      */
-	@TaskMapping(title = "报价记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "报价记录下载", fixedDelay = 30000, method = Method.DOWNLOAD)
     public void getFinanceOfferList() throws Exception {
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqlsDemand = new ArrayList<>();
@@ -522,9 +523,7 @@ public class B2BInformation  extends AbstractTask{
 		//Date beforeD = beforeTime.getTime();
 		//req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
-		
 		List<? extends FinanceOfferListOrBuilder> flist = resp.getFinanceOfferInfoOrBuilderList();
-		
 		for(FinanceOfferListOrBuilder Finance :flist){
 			sqls.add("MERGE INTO AcceptOffer ao"
 			+" USING (SELECT nvl(max(id),0) ID FROM AcceptOffer where CODE = '"+Finance.getAcceptOfferInfo().getCode()+"') b"
@@ -563,7 +562,6 @@ public class B2BInformation  extends AbstractTask{
     				    + "'"+Finance.getFinanceDemandInfo().getCsContactsPhone()+"','"+Finance.getFinanceDemandInfo().getPubTime()+"','"+Finance.getFinanceDemandInfo().getEndTime()+"'"
     				    + ",'"+Finance.getFinanceDemandInfo().getDealTime()+"','"+Finance.getFinanceDemandInfo().getOfferCount()+"','"+Finance.getFinanceDemandInfo().getFsDemandAmount()+"'"
     				    + ",'已上传')");
-			
 			if(Finance.getAcceptOfferInfo().getStatus() == 1002){
 				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
 				sqlloand.add("MERGE INTO AccountApply a"
@@ -601,6 +599,7 @@ public class B2BInformation  extends AbstractTask{
     				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");
 			}
 		}
+		
 		System.out.println(sqls);
         jdbcTemplate.batchExecute(sqls);  //报价信息
         jdbcTemplate.batchExecute(sqlsDemand);   //融资信息
@@ -615,7 +614,7 @@ public class B2BInformation  extends AbstractTask{
     /**
      * 下载报价详情
      */
-	@TaskMapping(title = "报价详情下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "报价详情下载", fixedDelay = 30000, method = Method.DOWNLOAD)
 	public void getFinanceOfferDetails() throws Exception {
 		final List<String> ordersqls = new ArrayList<>();   //订单详情
 		final List<String> acceptsqls = new ArrayList<>();   //验收单详情
@@ -625,9 +624,20 @@ public class B2BInformation  extends AbstractTask{
 		GetFinanceOfferDetailsResp resp = capitalSideSdk.getFinanceOfferDetails(req);
 		FinanceOfferDetails adetaillist =  resp.getFinanceOfferInfo();
 		List<OfferDetailAndFinanceAccept> restlist = adetaillist.getOfferDetailAndFinanceAcceptInfoList();
+		
 		for(OfferDetailAndFinanceAccept rest :restlist){
 			
-			ordersqls.add("MERGE INTO ACCEPTFINANCEDEMANDDETAIL a"
+			//判断主表是否存在明细 count>0 
+			int count = jdbcTemplate.count(" from ACCEPTFINANCEDEMANDDETAIL where code =?",rest.getFinanceDemandDetail().getCode());
+			if(count >0){
+				break;
+			}
+			ordersqls.add("insert into ACCEPTFINANCEDEMANDDETAIL(ID,CODE,FINANCEDEMANDCODE,CUSTENUU,CUSTENNAME,CUSTGRADE,PAYMENTS,ORDERID,ORDERCODE,ORDERTOTAL,"
+					+ "ACCEPTAMOUNT,UPLOADSTATUS) "
+					+ "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().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");
+		/*ordersqls.add("MERGE INTO ACCEPTFINANCEDEMANDDETAIL a"
 				    +" USING (SELECT nvl(max(id),0) ID from ACCEPTFINANCEDEMANDDETAIL where code = '"+rest.getFinanceDemandDetail().getCode()+"') b"
 				    +" ON (a.ID = b.ID)"
 				    +" WHEN MATCHED THEN "
@@ -638,10 +648,20 @@ public class B2BInformation  extends AbstractTask{
 				    + "ACCEPTAMOUNT,UPLOADSTATUS)"
 				    + "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().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");
-			
-
-			acceptsqls.add("MERGE INTO FINANCEDEMANDDETAILACCEPT a"
+				    + "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");*/
+			int countAccept = jdbcTemplate.count(" from FINANCEDEMANDDETAILACCEPT where code =?",rest.getFinanceDemandDetailAccept().getCode());
+			if(countAccept >0){
+				break;
+			}
+			acceptsqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
+        			+ "ACCEPTSTATUS,TITLE,SPEC,PRODUCTCODE,STATUS,UPLOADSTATUS) "
+        			+ "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
+        			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptItemId()+"','"+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()+"','已上传')");
+		
+			/*acceptsqls.add("MERGE INTO FINANCEDEMANDDETAILACCEPT a"
 				    +" USING (SELECT nvl(max(id),0) ID from FINANCEDEMANDDETAILACCEPT where code = '"+rest.getFinanceDemandDetailAccept().getCode()+"') b"
 				    +" ON (a.ID = b.ID)"
 				    +" WHEN MATCHED THEN "
@@ -654,13 +674,11 @@ public class B2BInformation  extends AbstractTask{
 				    + "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
         			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptItemId()+"','"+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().getSpec()+"','"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传')");*/
 			
-		}
-		System.out.println(acceptsqls);
-		System.out.println(ordersqls);
-		jdbcTemplate.batchExecute(acceptsqls);
-		jdbcTemplate.batchExecute(ordersqls);
+			}
+			jdbcTemplate.batchExecute(acceptsqls);
+			jdbcTemplate.batchExecute(ordersqls);
 		
 	}
 	
@@ -799,7 +817,7 @@ public class B2BInformation  extends AbstractTask{
 	 * 上传卖方客户额度申请
 	 * @throws Exception
 	 */
-	@TaskMapping(title = "上传卖方客户额度申请", fixedDelay = 60000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "上传卖方客户额度申请", fixedDelay = 60000, method = Method.UPLOAD)
 	public void saveOfferQuotaInfoReq() throws Exception{
 		List<Map<String, Object>> customerQuotaUpload = getCustomerQuotaUpload();
 		if (!CollectionUtils.isEmpty(customerQuotaUpload)) {
@@ -866,9 +884,11 @@ public class B2BInformation  extends AbstractTask{
                 "cq_custuu,cq_custname,cq_effectdays,cq_quota,cq_lendrate,cq_annualrate," +
                 "cq_repaymentmeans,cq_recorderuu from " +
                 "customerQuota where " +
-				"CQ_UPLOADSTATUS='待上传' and cq_quotatype='卖方客户' order by cq_code ) where rownum < 100");
+				"CQ_UPLOADSTATUS='待上传'  and cq_quotatype='卖方客户' order by cq_code ) where rownum < 100");
 		return maps;
 	}
+	
+
 }