1、上传原始运单改造

2、超时运单按照数据源返回

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -452,7 +452,13 @@ public class NoCarServiceImpl implements NoCarService {
             }
 
         }
-        if (noCarWayBillDb.getBillwayStatus() == 0 && !noCarWayBillDb.getFailReason().contains("原始运单协议已上传,请勿重复上传")) {
+        if (noCarWayBillDb.getBillwayStatus() == 0  && noCarWayBill.getFailReason() == null) {
+            return new RespR(false, "业务校验错误:请先上传原始运单协议\n" +
+                    ":803");
+        }
+
+
+        if (noCarWayBillDb.getBillwayStatus() == 0  && noCarWayBill.getFailReason() != null  && !noCarWayBill.getFailReason().contains("原始运单协议已上传,请勿重复上传")) {
             return new RespR(false, "业务校验错误:请先上传原始运单协议\n" +
                     ":803");
         }
@@ -760,7 +766,12 @@ public class NoCarServiceImpl implements NoCarService {
         }
         log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}", noCarWayBill, "开始");
 
-        if (noCarWayBillDb.getBillwayStatus() == 0 && !noCarWayBillDb.getFailReason().contains("原始运单协议已上传,请勿重复上传")) {
+        if (noCarWayBillDb.getBillwayStatus() == 0  && noCarWayBill.getFailReason() == null) {
+            return new RespR(false, "业务校验错误:请先上传原始运单协议\n" +
+                    ":803");
+        }
+
+        if (noCarWayBillDb.getBillwayStatus() == 0  && noCarWayBill.getFailReason() != null  && !noCarWayBill.getFailReason().contains("原始运单协议已上传,请勿重复上传")) {
             return new RespR(false, "业务校验错误:请先上传原始运单协议\n" +
                     ":803");
         }