实时结束运单增加未上传开始运单校验

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -319,6 +319,39 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper, NoC
             return new RespR(false, "余额不足");
         }
         StringBuffer stringBuffer = new StringBuffer();
+        for(NoCarWayBill noCarWayBill : noCarWayBills){
+
+            log.info("运单结束开始：NoCarServiceImpl.noCarWaybillEnd{}", noCarWayBill);
+            NoCarWayBill noCarWayBillDb = null;
+            try {
+                noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+            } catch (Exception e) {
+                noCarWaybillMapper.deleteNotRightWayBill(noCarWayBill.getBillNum());
+                try {
+                    noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+                } catch (Exception e1) {
+                    return new RespR(false, "运单异常，请联系管理员处理");
+                }
+            }
+            if (noCarWayBillDb == null) {
+                try {
+                    noCarWayBillDb = noCarWayBill.clone();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return new RespR(false, "系统异常，请重试");
+                }
+
+            }
+
+
+            if (null != noCarWayBillDb && noCarWayBillDb.getBillwayStatus() > 1) {
+                return new RespR(false, "运单已经结束或者是历史已结束运单，请联系管理员确认");
+            }
+            if (null != noCarWayBillDb &&  1 != noCarWayBillDb.getBillwayStatus() ) {
+                return new RespR(false, "开始运单未传或者还未处理完成，请确认并5分钟后重试");
+            }
+
+        }
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName, 2);
         executorService.execute(() -> {