代码优化开发20211101

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

@@ -586,6 +586,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setCustomerName(appKey);
             noCarWayBill.setCompanyName(noCarWayBill1.getCompanyName());
             noCarWayBill.setPlateNum(noCarWayBill1.getPlateNum());
+            noCarWayBill.setInterType(0);//接口
 
 
             RespR rs = noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);

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

@@ -168,6 +168,16 @@ public class NoCarWayBill implements Cloneable{
      */
     private String success;
 
+    private Integer interType = 1;//类型 0 接口 1平台
+
+    public Integer getInterType() {
+        return interType;
+    }
+
+    public void setInterType(Integer interType) {
+        this.interType = interType;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -493,7 +493,7 @@ public class NoCarServiceImpl implements NoCarService{
                return new RespR(billInvoices);
            }
         }
-       if(noCarWayBillDb.getBillwayStatus() == 3){
+       if(noCarWayBillDb.getBillwayStatus() == 3 && noCarWayBill.getInterType() != 0 ){
             //直接返回发票信息
             List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
             return new RespR(billInvoices);
@@ -551,8 +551,11 @@ public class NoCarServiceImpl implements NoCarService{
 
                 });
                 List<BillInvoice> billInvoices1 = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
-                if(billInvoices1!=null && billInvoices1.size()>0){
+                if(billInvoices1!=null && billInvoices1.size()>0 && noCarWayBill.getInterType() != 0){
+
                     return new RespR(billInvoices1);
+                }else if(billInvoices1!=null && billInvoices1.size()>0 && noCarWayBill.getInterType() == 0){
+                    return new RespR(responseRespR.getData());
                 }
             }
 

src/main/java/com/jkcredit/invoice/service/upService/impl/CommInterFaceImpl.java

@@ -28,7 +28,7 @@ public class CommInterFaceImpl implements CommInterFace{
         }catch (ApiRequestException apie) {
             log.error("CommInterFaceImpl.companyQuery:{}",apie.getMessage()+ " ,请求参数："+companyQueryRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -48,7 +48,7 @@ public class CommInterFaceImpl implements CommInterFace{
         }catch (ApiRequestException apie) {
             log.error("CommInterFaceImpl.addCompany：{}", apie.getMessage()+ " ,请求参数："+companyAddRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -69,7 +69,7 @@ public class CommInterFaceImpl implements CommInterFace{
         }catch (ApiRequestException apie) {
             log.error("CommInterFaceImpl.b2bContractAdd：{}",apie.getMessage()+ " ,请求参数："+contractAddRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -90,7 +90,7 @@ public class CommInterFaceImpl implements CommInterFace{
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
             log.error("CommInterFaceImpl.b2bContractQuery：{}",  apie.getMessage()+ " ,请求参数："+b2bContractQueryRequest.toString());
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 

src/main/java/com/jkcredit/invoice/service/upService/impl/NoCarInterfaceImpl.java

@@ -34,7 +34,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
             log.error(apie.getMessage()+ " ,请求参数："+registerRequest.toString());
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -56,7 +56,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
             log.error(apie.getMessage()+ " ,请求参数："+vehicleQueryRequest.toString());
             apie.printStackTrace();
 
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -76,7 +76,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillStartRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -96,7 +96,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillEndRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -118,7 +118,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryStartRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -139,7 +139,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillHistoryEndRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -160,7 +160,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillNumFindInvoiceRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -181,7 +181,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillInvoiceRedQueryRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -202,7 +202,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+waybillCountQueryRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 }

src/main/java/com/jkcredit/invoice/service/upService/impl/SelfCarInterfaceImpl.java

@@ -34,7 +34,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+cardBindQueryListToBRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -55,7 +55,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+cardQueryCardToBRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -77,7 +77,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+cardBindingToBRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -99,7 +99,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+cardValidCodeToBRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -121,7 +121,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+cardUnbindToBRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -143,7 +143,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+cardTradeRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -163,7 +163,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceApplyRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -185,7 +185,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -206,7 +206,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+b2BInvoiceQueryByApplyRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 
@@ -227,7 +227,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         }catch (ApiRequestException apie) {
             log.error(apie.getMessage()+ " ,请求参数："+b2bInvoicePackageRequest.toString());
             apie.printStackTrace();
-            return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
+            return new RespR(false,apie.getMessage());
         }
     }
 }