Administrator il y a 4 ans
Parent
commit
2e45845f4c

+ 94 - 80
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -78,6 +78,8 @@ public class OrderDunTask {
 		updateNewOrderDun();
 		Thread.sleep(2000);
 		updateorderDun();
+		Thread.sleep(2000);
+		updatePaymentNode();
 	}
 	
 	/**
@@ -136,7 +138,29 @@ public class OrderDunTask {
 				
 			}
 		}
-  		LoggerUtils.debug(logger, "======================催款任务结束,付款催款开始===================");
+  		
+  		} catch (Exception e) {
+  			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", "催款处理失败");
+			try {
+				asyncUtils.send(emailBo);
+			} catch (UnsupportedEncodingException | MessagingException e1) {
+				e1.printStackTrace();
+			}
+  			LoggerUtils.error(getClass(), "=============================================");
+			LoggerUtils.error(getClass(), "新催款的信息处理失败", e);
+			LoggerUtils.error(getClass(), "=============================================");
+		}
+  	}
+	
+	
+	/**
+	 * 处理付款催款
+	 */
+	private void updatePaymentNode() {
+		LoggerUtils.debug(logger, "======================催款任务结束,付款催款开始===================");
+		Calendar calendar=Calendar.getInstance();   
+  		Calendar calendar2=Calendar.getInstance();
+  		try {
   		List<OutPaymentNode> list2=paymentNodeMapper.selectByStatus(0);
   		for (OutPaymentNode pn : list2) {
   			calendar2.setTime(pn.getCreateTime());
@@ -145,7 +169,7 @@ public class OrderDunTask {
   				CalendarTimeCleared(calendar2);
   				if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
   					updatePaymentNode(pn);
-  	  	  			Thread.sleep(2000);
+						Thread.sleep(2000);
   				}
   			}
   			if(pn.getProjectType()==OrderDunProjectType.CS.getCode()&&pn.getDunType()==2) {
@@ -169,68 +193,11 @@ public class OrderDunTask {
   	  				updatePaymentNode(pn);
 	  	  			Thread.sleep(2000);
 				}
-				
-			}
-		}
-  		} catch (Exception e) {
-  			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", "催款处理失败");
-			try {
-				asyncUtils.send(emailBo);
-			} catch (UnsupportedEncodingException | MessagingException e1) {
-				e1.printStackTrace();
-			}
-  			LoggerUtils.error(getClass(), "=============================================");
-			LoggerUtils.error(getClass(), "新催款的信息处理失败", e);
-			LoggerUtils.error(getClass(), "=============================================");
+  	  		}
+  		}
+  		} catch (InterruptedException e) {
+  			LoggerUtils.error(getClass(), "===========================付款催款失败==========================", e);
 		}
-  	
-  		//处理旧催款
-  		updateorderDun();
-  		
-  	}
-	
-	
-	private void updatePaymentNode(OutPaymentNode pn) {
-		PaymentNode p=new PaymentNode();
-		p.setId(pn.getId());
-		p.setDunStatus(1);
-		p.setStartTime(new Date());
-		paymentNodeMapper.updateByPrimaryKeySelective(p);
-		orderProjectService.addNoticAndEmail(pn,NoticeStatus.PAYMENT_DUN.getCode());
-	}
-	
-	
-
-
-	private void CalendarTimeCleared(Calendar calendar) {
-		calendar.set(Calendar.HOUR_OF_DAY, 0);
-	    calendar.set(Calendar.MINUTE, 0);
-	    calendar.set(Calendar.SECOND, 0);
-	    calendar.set(Calendar.MILLISECOND, 0);
-	}
-
-
-	private void updateOrderDun(OutNewOrderDunBo t) throws UnsupportedEncodingException, MessagingException {
-		InputNewOrderDunBo o=new InputNewOrderDunBo();
-		o.setId(t.getId());
-		o.setStatus(1);
-		o.setStartTime(new Date());
-		newOrderDunService.updateDun(o);
-		tOrderMidMapper.addOrderReceivables(t.getOrderNo(),t.getMoney());
-		TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
-			TArrearsDun td=new TArrearsDun();
-			td.setOrderArrears(tm.getOrderArrears());
-			td.setOrderReceivables(tm.getOrderReceivables());
-			if (tArrearsDunMapper.checkOrderNo(t.getOrderNo(),null)<1) {
-				td.setOrderNo(t.getOrderNo());
-				tArrearsDunMapper.insertSelective(td);
-			}else if(tArrearsDunMapper.checkOrderNo(t.getOrderNo(),0)>0){
-				Integer i=tArrearsDunMapper.selectByStatus(t.getOrderNo(), 0);
-				td.setId(i);
-				tArrearsDunMapper.updateByPrimaryKeySelective(td);
-			}
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
-		orderNewService.addTimingTaskNewDunNoticAndSendEmail(t2, t);
 	}
 	
 	/**
@@ -313,26 +280,10 @@ public class OrderDunTask {
 		}
 	}
 	
-	
-	private void addNotic(String orderNo, TArrearsDun td, Integer code) throws UnsupportedEncodingException, MessagingException {
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
-			String str=NoticeStatus.getValueByCode(code)+": 订单编号 -"+orderNo+", 操作人: 平台超管中心 - yxy。";
-			Notice n =new Notice();
-			n.setId(UUID.randomUUID().toString());
-			n.setAid(b.getSalesmanId());
-			n.setNoticeType(code);
-			n.setContent(str);
-			n.setReaded(0);//未读
-			asyncUtils.addNotice(n);
-	}
-
-
 	/**
-	*
+	*	旧催款处理
 	*
 	*/
-//	@RequestMapping(value = "/open/updateOrderDun", method = RequestMethod.GET)
-//	@Scheduled(cron = "0 0 2  * * ?") 
   	@Transactional(rollbackFor=Exception.class)
 	public void updateorderDun(){
   		try {
@@ -358,6 +309,69 @@ public class OrderDunTask {
 		}
   		
   	}
+	
+	
+	
+	private void updatePaymentNode(OutPaymentNode pn) {
+		PaymentNode p=new PaymentNode();
+		p.setId(pn.getId());
+		p.setDunStatus(1);
+		p.setStartTime(new Date());
+		paymentNodeMapper.updateByPrimaryKeySelective(p);
+		orderProjectService.addNoticAndEmail(pn,NoticeStatus.PAYMENT_DUN.getCode());
+	}
+	
+	
+
+
+	private void CalendarTimeCleared(Calendar calendar) {
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+	    calendar.set(Calendar.MINUTE, 0);
+	    calendar.set(Calendar.SECOND, 0);
+	    calendar.set(Calendar.MILLISECOND, 0);
+	}
+
+
+	private void updateOrderDun(OutNewOrderDunBo t) throws UnsupportedEncodingException, MessagingException {
+		InputNewOrderDunBo o=new InputNewOrderDunBo();
+		o.setId(t.getId());
+		o.setStatus(1);
+		o.setStartTime(new Date());
+		newOrderDunService.updateDun(o);
+		tOrderMidMapper.addOrderReceivables(t.getOrderNo(),t.getMoney());
+		TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
+			TArrearsDun td=new TArrearsDun();
+			td.setOrderArrears(tm.getOrderArrears());
+			td.setOrderReceivables(tm.getOrderReceivables());
+			if (tArrearsDunMapper.checkOrderNo(t.getOrderNo(),null)<1) {
+				td.setOrderNo(t.getOrderNo());
+				tArrearsDunMapper.insertSelective(td);
+			}else if(tArrearsDunMapper.checkOrderNo(t.getOrderNo(),0)>0){
+				Integer i=tArrearsDunMapper.selectByStatus(t.getOrderNo(), 0);
+				td.setId(i);
+				tArrearsDunMapper.updateByPrimaryKeySelective(td);
+			}
+		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		orderNewService.addTimingTaskNewDunNoticAndSendEmail(t2, t);
+	}
+	
+	
+	
+	
+	private void addNotic(String orderNo, TArrearsDun td, Integer code) throws UnsupportedEncodingException, MessagingException {
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
+			String str=NoticeStatus.getValueByCode(code)+": 订单编号 -"+orderNo+", 操作人: 平台超管中心 - yxy。";
+			Notice n =new Notice();
+			n.setId(UUID.randomUUID().toString());
+			n.setAid(b.getSalesmanId());
+			n.setNoticeType(code);
+			n.setContent(str);
+			n.setReaded(0);//未读
+			asyncUtils.addNotice(n);
+	}
+
+
+	
 
 
 	private void updateOrderDun(OrderDunTaskBo t) throws UnsupportedEncodingException, MessagingException {

+ 2 - 0
src/main/java/com/goafanti/order/bo/outOrderDunListBo.java

@@ -34,7 +34,9 @@ public class outOrderDunListBo {
 		return id;
 	}
 	public String getDunSubject() {
+		//旧催款
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
+		//新催款
 		if(getDunType()!=null&&getDunType()!=0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
 		if(getDunType()!=null&&getDunType()==0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()))+getCustomizeName();
 		return dunSubject;