|
|
@@ -33,7 +33,6 @@ 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.order.bo.InputNewOrderDunBo;
|
|
|
@@ -76,18 +75,13 @@ public class OrderDunTask {
|
|
|
|
|
|
List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
|
|
|
Calendar calendar=Calendar.getInstance();
|
|
|
- calendar.setTime(new Date());
|
|
|
- System.out.println(DateUtils.formatDate(new Date(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
- System.out.println(DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
- 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());
|
|
|
- System.out.println(o.getOrderNo());
|
|
|
- System.out.println(DateUtils.formatDate(new Date(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
- System.out.println(DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
- System.out.println(DateUtils.formatDate(calendar2.getTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
|
|
|
updateOrderDun(o);
|
|
|
Thread.sleep(2000);
|
|
|
@@ -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);
|
|
|
}
|