自有车添加本地计费时间，无车添加拆分运单号字段

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

@@ -1120,51 +1120,64 @@ public class NoCarServiceImpl implements NoCarService {
      */
     @Override
     public RespR getInvoiceByWayBillOwnerNumReal(NoCarWayBill noCarWayBill, boolean isInterface) {
+        log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}", noCarWayBill, isInterface);
+        if(noCarWayBill.getBillwayStatus() == 3){
+             return new RespR("success");
+        }
+        RespR<WaybillNumFindInvoiceResponse> responseRespR=null;
+        if(noCarWayBill.getSplitFlag() == NoCarWayBill.SPLIT_FALG_TRUE){
+            int size = DateUtil.getSplitTimeOver96(noCarWayBill.getStartTime(),noCarWayBill.getPredictEndTime()).size();
+            for(int i=0;i<size;i++){
+                String newBillNum = noCarWayBill.getBillNum()+"-jk0"+i;
+                billInvoiceMapper.deleteByBillNum(newBillNum);
+                WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
+                String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
+                waybillNumFindInvoiceRequest.setCompanyNum(companyNum);
+                waybillNumFindInvoiceRequest.setWaybillNum(newBillNum);
+                RespR<WaybillNumFindInvoiceResponse> responseRespRrec = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
+                if (responseRespRrec.getCode() == 1) {
+                    log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}", noCarWayBill, isInterface, responseRespR.getMsg());
+                }else{
+                    if(responseRespR == null){
+                        responseRespR = responseRespRrec;
+                        responseRespR.getData().setWaybillNum(noCarWayBill.getBillNum());
+                    }else{
+                        if(responseRespR.getData().getWaybillStatus()>responseRespRrec.getData().getWaybillStatus()){
+                            responseRespR.getData().setWaybillStatus(responseRespRrec.getData().getWaybillStatus());
+                        }
+                        responseRespR.getData().getResult().addAll(responseRespRrec.getData().getResult());
+                    }
+                }
+
+            }
+           if(responseRespR == null){
+                 return new RespR(false,"失败"+noCarWayBill.getBillNum());
+           }
+        }else{
+            //进行取票操作
+            WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
+            String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
+            waybillNumFindInvoiceRequest.setCompanyNum(companyNum);
+            waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBill.getBillNum());
+            responseRespR = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
+        }
 
-        WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
-        String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
-        waybillNumFindInvoiceRequest.setCompanyNum(companyNum);
-        waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBill.getBillNum());
-        RespR<WaybillNumFindInvoiceResponse> responseRespR = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
         if (responseRespR.getCode() == 1) {
-            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillOwnerNumReal{},isCurr{},msg{}", noCarWayBill, isInterface, responseRespR.getMsg());
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}", noCarWayBill, isInterface, responseRespR.getMsg());
             return new RespR(false, responseRespR.getMsg());
         } else {
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
+            //更改票状态
             noCarWayBill.setBillwayStatus(tempStatus);
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
-            NoCarWayBill curr = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-            if (curr == null) {
-                noCarWaybillMapper.insert(noCarWayBill);
-            } else {
-                noCarWaybillMapper.updateByBillNum(noCarWayBill);
-            }
-
-            if (tempStatus > 1) {
-                //删除已有发票
-                billInvoiceMapper.deleteByBillNum(noCarWayBill.getBillNum());
-                //发票入库
-                List<InvoiceProcessingListModel> invoiceProcessingListModels = responseRespR.getData().getResult();
-                invoiceProcessingListModels.stream().forEach(invoiceProcessingListModel -> {
-                    log.info("44444getInvoiceByWayBillOwnerNumReal{}", invoiceProcessingListModel.getTransactionId());
-                    BillInvoice billInvoice = buildFromInvoiceProcessingListModel(invoiceProcessingListModel);
-                    billInvoice.setCompanyName(noCarWayBill.getCompanyName());
-                    billInvoice.setCompanyNum(noCarWayBill.getCompanyNum());
-                    billInvoice.setCustomerName(noCarWayBill.getCustomerName());
-                    NoCarCalculateInfor noCarCalculateInfor = calculateInforMapper.selectByTradeId(billInvoice.getTransactionId());
-                    if (noCarCalculateInfor != null) {
-                        billInvoice.setCalculateTime(noCarCalculateInfor.getCalculateTime());
-                    } else {
-                        billInvoice.setCalculateTime("2021-01-10 00:00:00");
-                    }
-                    billInvoiceMapper.insert(billInvoice);
-                });
-                log.info("6666666getInvoiceByWayBillOwnerNumReal{}", noCarWayBill.getBillNum());
-
-            }
+            noCarWaybillMapper.updateByBillNum(noCarWayBill);
+        }
+        byte isKf =1;
+        if (countCalculateInfo(noCarWayBill, isKf, responseRespR)) {
             return new RespR(responseRespR.getData());
-
         }
+        log.info("99999999{}", noCarWayBill.getBillNum());
+        return new RespR("success");
     }
 
 

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -173,10 +173,10 @@ public class ScheduledBillTask {
     SelfCarInterface selfCarInterface;
 
 
-    @Scheduled(cron = "0 20 30 4 * ?", zone = "Asia/Shanghai")
+    /*@Scheduled(cron = "0 40 22 4 * ?", zone = "Asia/Shanghai")
     public void  test()throws Exception{
         getSefCarInvoice();
-    }
+    }*/
     /**
      * @Scheduled(cron = "0 0 23 * * ?", zone = "Asia/Shanghai")
      * @throws Exception