|
@@ -27,6 +27,9 @@ import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
+
|
|
|
+import static com.jkcredit.invoice.common.CommonConst.*;
|
|
|
+
|
|
|
@Service
|
|
|
@Slf4j
|
|
|
public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCarWayBill> implements NoCarBillWayService{
|
|
@@ -108,7 +111,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
|
|
|
}
|
|
|
noCarWayBill.setCompanyName(customerRec.getCompanyName());
|
|
|
noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
|
|
|
- if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
|
|
|
+ if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())< INTONE){
|
|
|
noCarWaybillMapperImprt.updateBillway(-2,"失败,运单开始时间超72小时#",noCarWayBill);
|
|
|
noCarWayBill.setBillwayStatus(-2);
|
|
|
noCarWayBill.setFailReason("失败,运单开始时间超72小时");
|
|
@@ -201,7 +204,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
|
|
|
}
|
|
|
noCarWayBill.setCompanyName(customerRec.getCompanyName());
|
|
|
noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
|
|
|
- if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){
|
|
|
+ if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date()) > INTTOW){
|
|
|
log.info("历史运单开始上传失败:NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
|
|
|
noCarWayBill.setBillwayStatus(-2);
|
|
|
noCarWayBill.setFailReason("失败,运单未满20天时效");
|
|
@@ -209,7 +212,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
|
|
|
insertOrUpdateBillStart(noCarWayBill);
|
|
|
return;
|
|
|
}
|
|
|
- if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.stringToDate(noCarWayBill.getPredictEndTime()))<-96){
|
|
|
+ if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.stringToDate(noCarWayBill.getPredictEndTime()))< INTTHREE){
|
|
|
noCarWayBill.setBillwayStatus(-2);
|
|
|
noCarWayBill.setFailReason("运单已经超时,请拆分");
|
|
|
insertOrUpdateBillStart(noCarWayBill);
|