|
|
@@ -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;
|
|
|
@@ -23,10 +21,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
-import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.dao.AdminMapper;
|
|
|
import com.goafanti.common.dao.NoticeMapper;
|
|
|
import com.goafanti.common.dao.TArrearsDunMapper;
|
|
|
import com.goafanti.common.dao.TOrderMidMapper;
|
|
|
@@ -37,16 +33,13 @@ import com.goafanti.common.model.TArrearsDun;
|
|
|
import com.goafanti.common.model.TOrderDun;
|
|
|
import com.goafanti.common.model.TOrderMid;
|
|
|
import com.goafanti.common.model.TOrderNew;
|
|
|
-import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.SendEmailUtil;
|
|
|
-import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.InputNewOrderDunBo;
|
|
|
import com.goafanti.order.bo.OrderDunTaskBo;
|
|
|
import com.goafanti.order.bo.OutNewOrderDunBo;
|
|
|
import com.goafanti.order.bo.TOrderNewBo;
|
|
|
import com.goafanti.order.enums.OrderDunProjectType;
|
|
|
-import com.goafanti.order.enums.OrderDunSubject;
|
|
|
import com.goafanti.order.service.NewOrderDunService;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
|
|
|
@@ -82,9 +75,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());
|
|
|
@@ -141,6 +135,7 @@ public class OrderDunTask {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
private void CalendarTimeCleared(Calendar calendar) {
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
calendar.set(Calendar.MINUTE, 0);
|
|
|
@@ -155,6 +150,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);
|
|
|
}
|