无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/controller/interserver/NoCarServiceController.java

@@ -949,7 +949,32 @@ public class NoCarServiceController {
                 "佛山市麟华物流有限公司",
                 "佛山市智奔物流有限公司",
                 "山西云启信达供应链科技有限公司",
-                "苏州鹏锦物流有限公司"
+                "苏州鹏锦物流有限公司",
+                "风神物流有限公司",
+                "临沂宝华供应链管理有限公司",
+                "广州市展弘运输服务有限公司",
+                "苏州可通物流有限公司",
+                "安徽曹运数字科技有限责任公司",
+                "广州润和物流有限公司",
+                "东莞市中大物流有限公司",
+                "江西三华物流有限公司",
+                "广州聚隆物流有限公司",
+                "江苏速派瑞物联科技有限公司",
+                "江西久丰物流有限公司",
+                "广州一晓仓储有限公司",
+                "山东宝华供应链管理有限公司",
+                "东莞市鸣航物流有限公司",
+                "江西志满网络科技有限公司湾沚区分公司",
+                "广东可通物流有限公司",
+                "宁夏盛远达运输有限公司",
+                "广州安捷达物流有限公司",
+                "长沙德坤物流有限公司",
+                "广州市永骏物流有限公司",
+                "辽宁八方网络科技有限责任公司",
+                "广州兴运邦物流有限公司",
+                "广州市安和运输有限公司",
+                "厦门飞鸿捷货运代理有限公司广州分公司",
+                "深圳市安能物流科技有限公司"
         };
         mounthAccMapper.deleteAll();
         for(int i=0;i<companys.length;i++){

src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarWayBill.java

@@ -182,7 +182,7 @@ public class NoCarWayBill implements Cloneable{
      */
     private String success;
 
-    private Integer interType = 1;//类型 0 接口 1平台
+    private Integer interType = 1;//类型 0 接口 1平台 4 迁移取票完成
 
     public Integer getInterType() {
         return interType;

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

@@ -544,14 +544,20 @@ public class NoCarServiceImpl implements NoCarService{
     @Transactional(isolation= Isolation.READ_COMMITTED)
     public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isInterface) {
         byte isKf = 1;
+        /**
+         * 迁移数据
+         */
         if(noCarWayBill.getInterType() == 3){
             isKf = 3;
         }
+        /**
+         * 特殊处理数据
+         */
         if(noCarWayBill.getInterType() == 5){
             isKf = 5;
         }
         log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isInterface);
-        if(isInterface && noCarWayBill.getBillwayStatus()!=-5){
+        if(isInterface && (noCarWayBill.getBillwayStatus()!=-5 || noCarWayBill.getInterType() == 4)){
             if(noCarWayBill.getBillwayStatus() == 1 || noCarWayBill.getBillwayStatus() == 2 || noCarWayBill.getBillwayStatus() == 3 || noCarWayBill.getBillwayStatus() == 4){
                 //直接返回发票信息
                 List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
@@ -584,6 +590,10 @@ public class NoCarServiceImpl implements NoCarService{
             if(noCarWayBill.getBillwayStatus()==-5){
                 if(isKf != 3){
                     noCarWayBill.setInterType(0);
+                }else{
+                    if(tempStatus == 3){
+                        noCarWayBill.setInterType(4);
+                    }
                 }
                 noCarWayBill.setPlateNum(responseRespR.getData().getPlateNum());
                 noCarWayBill.setStartTime(DateUtil.tTimeToDate(responseRespR.getData().getWaybillStartTime()));
@@ -615,7 +625,12 @@ public class NoCarServiceImpl implements NoCarService{
                     billInvoice.setCustomerName(noCarWayBill.getCustomerName());
                     //扣费明细入账
                     NoCarCalculateInfor calculateInfor = new NoCarCalculateInfor();
-                    calculateInfor.setCalculateTime(DateUtil.getCurrentDateStr());
+                    if(noCarWayBill.getInterType()!=4){
+                        calculateInfor.setCalculateTime(DateUtil.getCurrentDateStr());
+                    }else{
+                        calculateInfor.setCalculateTime("2021-01-11 00:00:00");
+                    }
+
                     calculateInfor.setCompanyNum(noCarWayBill.getCompanyNum());
                     calculateInfor.setCtype(1);
                     calculateInfor.setCustomId(noCarWayBill.getCustomerName());
@@ -731,7 +746,12 @@ public class NoCarServiceImpl implements NoCarService{
         CustomerRec customerRec = null;
         List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyName(monthAccountQueryVo.getCompanyName());
         if(customerRecs != null && customerRecs.size()>0){
-            customerRec = customerRecs.get(0);
+            for(CustomerRec customerRec1:customerRecs){
+                if("2".equals(customerRec1.getBussinessType())){
+                    customerRec = customerRec1;
+                    break;
+                }
+            }
         }
 
         if(customerRec == null || customerRec.getRecStatus()!=1){