优化代码提交

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -196,7 +196,7 @@ public class NoCarController {
             if(noCarWayBills!=null && noCarWayBills.size()>0){
                 noCarWayBills.stream().forEach(noCarWayBill -> {
                     try {
-                         noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+                         noCarService.getInvoiceByWayBillNumReal(noCarWayBill,false);
                     }catch (Exception e){
                         e.printStackTrace();
                     }
@@ -205,18 +205,6 @@ public class NoCarController {
             return new RespR("更新成功");
 
     }
-    public void delGetInvoce(Integer historyFlag){
-        log.info("开始取票HISflag:"+historyFlag);
-        NoCarWayBill carWayBill = new NoCarWayBill();
-        carWayBill.setHisFlag(historyFlag);
-        carWayBill.setBillwayStatus(2);
-        List<NoCarWayBill> noCarWayBillsMdEnd = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
-        if(noCarWayBillsMdEnd!=null && noCarWayBillsMdEnd.size()>0){
-            noCarWayBillsMdEnd.stream().forEach(noCarWayBill -> {
-                noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
-            });
-        }
-    }
     /**
      * 分页查询异常运单信息
      *

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

@@ -32,7 +32,7 @@ public class NoCarServiceController {
     @ApiOperation(value="发票查询接口（走本地库）", notes="发票查询接口（走本地库）")
     //@LoginRequired
     public RespR noCarVoiceQuery(@RequestBody NoCarWayBill noCarWayBill){
-        return noCarService.getInvoiceByWayBillNumReal(noCarWayBill,false);
+        return noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
     }
 
     /**

src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java

@@ -678,17 +678,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg("运单号异常,无法开票");
                 return result;
             }
-
-
-            NoCarWayBill noCarWayBill = new NoCarWayBill();
-            noCarWayBill.setBillNum(num);
-            noCarWayBill.setCustomerName(appKey);
-            noCarWayBill.setCompanyName(noCarWayBill1.getCompanyName());
-            noCarWayBill.setPlateNum(noCarWayBill1.getPlateNum());
-            noCarWayBill.setInterType(0);//接口
-
-
-            RespR rs = noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+            noCarWayBill1.setCustomerName(appKey);
+            noCarWayBill1.setCompanyName(noCarWayBill1.getCompanyName());
+            RespR rs = noCarService.getInvoiceByWayBillNumReal(noCarWayBill1,true);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarVoiceQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="

src/main/java/com/jkcredit/invoice/service/lowerService/NoCarService.java

@@ -61,10 +61,10 @@ public interface NoCarService {
     /**
      * 获取发票和运单状态 true 实时 false 走本地
      * @param noCarWayBill
-     * @param isCurr
+     * @param isInterface
      * @return
      */
-    RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill,boolean isCurr);
+    RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill,boolean isInterface);
 
     /**
      * 红冲发票查询

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

@@ -460,53 +460,60 @@ public class NoCarServiceImpl implements NoCarService{
         waybillNumFindInvoiceResponse.setInfo("成功");
         waybillNumFindInvoiceResponse.setWaybillStartTime(noCarWayBill.getStartTime());
         waybillNumFindInvoiceResponse.setWaybillEndTime(noCarWayBill.getPredictEndTime());
-        waybillNumFindInvoiceResponse.setWaybillStatus(3);
+        waybillNumFindInvoiceResponse.setWaybillStatus(noCarWayBill.getBillwayStatus());
         waybillNumFindInvoiceResponse.setReceiveTime(DateUtil.getCurrentDateStr());
         waybillNumFindInvoiceResponse.setWaybillNum(noCarWayBill.getBillNum());
         return waybillNumFindInvoiceResponse;
     }
     @Override
     @Transactional
-    public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isCurr) {
-        log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isCurr);
-        NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-        if(null == noCarWayBillDb){
-            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,"运单号异常,无法开票");
-            return new RespR(false,"运单状态异常,无法开票");
-        }
-       if(noCarWayBillDb.getBillwayStatus() == 3){
-            //直接返回发票信息
-            List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
-            if(noCarWayBill.getInterType() == 0){
+    public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isInterface) {
+        log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isInterface);
+       if(noCarWayBill.getBillwayStatus() == 3){
+
+            if(isInterface){
+                //直接返回发票信息
+                List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
                 return new RespR(buildInterFaceVoiceData(noCarWayBill,billInvoices));
+            }else{
+                return new RespR("success");
             }
 
         }
+        if(noCarWayBill.getBillwayStatus() == 2){
+
+            if(isInterface){
+                //直接返回发票信息
+                List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
+                return new RespR(buildInterFaceVoiceData(noCarWayBill,billInvoices));
+            }
+        }
+        int status = noCarWayBill.getBillwayStatus();
+        if(status !=2){
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,"运单转态,无法开票");
+            return new RespR(false,"运单状态无法开票");
+        }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
-            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,respR.getMsg());
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isInterface,respR.getMsg());
             return  respR;
         }
-        int status = noCarWayBillDb.getBillwayStatus();
-        if(status == 1 || status == 4){
-            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,"运单转态,无法开票");
-            return new RespR(false,"运单状态无法开票");
-        }
+
         //进行取票操作
         WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         waybillNumFindInvoiceRequest.setCompanyNum(companyNum);
-        waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBillDb.getBillNum());
+        waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBill.getBillNum());
         RespR<WaybillNumFindInvoiceResponse> responseRespR = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
         if(responseRespR.getCode() == 1){
-            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,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();
             //更改票状态
-            noCarWayBillDb.setBillwayStatus(tempStatus);
-            noCarWayBillDb.setUpdateTime(DateUtil.getCurrentDateStr());
-            noCarWaybillMapper.updateByBillNum(noCarWayBillDb);
+            noCarWayBill.setBillwayStatus(tempStatus);
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
+            noCarWaybillMapper.updateByBillNum(noCarWayBill);
             if(tempStatus == 2 || tempStatus==3){
                 //删除已有发票
                 billInvoiceMapper.deleteByBillNum(noCarWayBill.getBillNum());
@@ -516,13 +523,13 @@ public class NoCarServiceImpl implements NoCarService{
                 Set<NoCarCalculateInfor> carCalculateInfors = new HashSet<>();
                 invoiceProcessingListModels.stream().forEach(invoiceProcessingListModel -> {
                     BillInvoice billInvoice = buildFromInvoiceProcessingListModel(invoiceProcessingListModel);
-                    billInvoice.setCompanyName(noCarWayBillDb.getCompanyName());
-                    billInvoice.setCompanyNum(noCarWayBillDb.getCompanyNum());
-                    billInvoice.setCustomerName(noCarWayBillDb.getCustomerName());
+                    billInvoice.setCompanyName(noCarWayBill.getCompanyName());
+                    billInvoice.setCompanyNum(noCarWayBill.getCompanyNum());
+                    billInvoice.setCustomerName(noCarWayBill.getCustomerName());
                     //扣费明细入账
                     NoCarCalculateInfor calculateInfor = new NoCarCalculateInfor();
                     calculateInfor.setCalculateTime(DateUtil.getCurrentDateStr());
-                    calculateInfor.setCompanyNum(noCarWayBillDb.getCompanyNum());
+                    calculateInfor.setCompanyNum(noCarWayBill.getCompanyNum());
                     calculateInfor.setCtype(1);
                     calculateInfor.setCustomId(noCarWayBill.getCustomerName());
                     calculateInfor.setBuyerName(invoiceProcessingListModel.getBuyerName());
@@ -558,7 +565,7 @@ public class NoCarServiceImpl implements NoCarService{
 
                 });
                 customerMapper.updateByPrimaryKeySelective(customer);
-                if(noCarWayBill.getInterType() == 0){
+                if(isInterface){
                     return new RespR(responseRespR.getData());
                 }
             }

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

@@ -78,7 +78,7 @@ public class ScheduledBillTask {
         List<NoCarWayBill> noCarWayBillsMdEnd = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
         if(noCarWayBillsMdEnd!=null && noCarWayBillsMdEnd.size()>0){
             noCarWayBillsMdEnd.parallelStream().forEach(noCarWayBill -> {
-                noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+                noCarService.getInvoiceByWayBillNumReal(noCarWayBill,false);
             });
         }
     }