|
|
@@ -3,7 +3,6 @@ package com.goafanti.common.task;
|
|
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
@@ -11,7 +10,6 @@ import java.util.UUID;
|
|
|
|
|
|
import javax.mail.MessagingException;
|
|
|
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -74,11 +72,11 @@ public class OrderDunTask {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 每天凌晨2点轮询处理需要新催款的信息
|
|
|
+ * 每天凌晨3点轮询处理需要新催款的信息
|
|
|
*/
|
|
|
@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- @Scheduled(cron = "0 0 2 * * ?")
|
|
|
+ @Scheduled(cron = "0 0 3 * * ?")
|
|
|
@Transactional(rollbackFor=Exception.class)
|
|
|
public void updateNewOrderDun(){
|
|
|
try {
|
|
|
@@ -86,10 +84,10 @@ public class OrderDunTask {
|
|
|
|
|
|
List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
|
|
|
Calendar calendar=Calendar.getInstance();
|
|
|
- calendar.setTime(new Date());
|
|
|
- Calendar calendar2=Calendar.getInstance();
|
|
|
-
|
|
|
+ Calendar calendar2=Calendar.getInstance();
|
|
|
+ Date date =new Date();
|
|
|
for (OutNewOrderDunBo o : list) {
|
|
|
+ calendar.setTime(date);
|
|
|
calendar2.setTime(o.getCreateTime());
|
|
|
if (o!=null&&o.getApproval()!=null&&o.getApproval()!=0&&o.getDunType()==1&&o.getWaitDay()!=null) {
|
|
|
calendar2.add(Calendar.DATE, o.getWaitDay());
|
|
|
@@ -210,6 +208,19 @@ public class OrderDunTask {
|
|
|
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);
|
|
|
}
|
|
|
@@ -291,7 +302,7 @@ public class OrderDunTask {
|
|
|
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- LoggerUtils.error(getClass(), "===========================旧欠款催款失败==========================", e);
|
|
|
+ LoggerUtils.error(getClass(), "===========================欠款催款失败==========================", e);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -313,10 +324,12 @@ public class OrderDunTask {
|
|
|
*
|
|
|
*
|
|
|
*/
|
|
|
- @RequestMapping(value = "/open/updateOrderDun", method = RequestMethod.GET)
|
|
|
+// @RequestMapping(value = "/open/updateOrderDun", method = RequestMethod.GET)
|
|
|
+ @Scheduled(cron = "0 0 2 * * ?")
|
|
|
+ @Transactional(rollbackFor=Exception.class)
|
|
|
public void updateorderDun(){
|
|
|
try {
|
|
|
- LoggerUtils.debug(logger, "======================旧催款任务轮询启动===================");
|
|
|
+ LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
|
|
|
List<OrderDunTaskBo> list=orderNewService.selectAllOrderDun();
|
|
|
for (OrderDunTaskBo t : list) {
|
|
|
if (t.getDunSubject()/10==1) {//1则为订单催款信息否则为项目催款信息
|
|
|
@@ -333,7 +346,7 @@ public class OrderDunTask {
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
LoggerUtils.error(getClass(), "=============================================");
|
|
|
- LoggerUtils.error(getClass(), "旧催款的信息处理失败", e);
|
|
|
+ LoggerUtils.error(getClass(), "催款的信息处理失败", e);
|
|
|
LoggerUtils.error(getClass(), "=============================================");
|
|
|
}
|
|
|
|