From cc4d660c2839d65db543e551aebfd80d02bc9d7d Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Thu, 26 Oct 2023 16:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=8A=A8=E8=BD=A6?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jianshui/invoice/domain/BillInfo.java  | 3 ++-
 .../api/aisino/console/AisinoConsoleInvoiceAddDTO.java   | 2 ++
 .../api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java   | 9 ++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java
index d9136ea..a202802 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java
@@ -392,7 +392,8 @@ public class BillInfo extends BaseEntity
 
 
 
-
+    @TableField(exist=false)
+    private String jdcbz; // 机动车标志
 
 
 
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
index 625efcf..aa9a443 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
@@ -108,6 +108,8 @@ public class AisinoConsoleInvoiceAddDTO {
     private Double quantity;
 
 
+    @Alias("jdcbz")
+    private String JDCBZ;
 
     // 机动车发票开具新增字段start
 
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java
index 771acf0..7aea75a 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java
@@ -89,16 +89,19 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
     @Override
     public HXResponse addInvoice(BillInfo billInfo, Companyservice companyservice) throws IllegalAccessException, InstantiationException {
 
-
-        // 订单号唯一校验 start
         String outNO = billInfo.getOutTradeOrderno() != null ? billInfo.getOutTradeOrderno() : "";
         if (StrUtil.isEmpty(outNO)) {
             return new HXResponse("订单号为空，请检查报文！");
         }
+        // 订单号唯一校验 start
+        /*String outNO = billInfo.getOutTradeOrderno() != null ? billInfo.getOutTradeOrderno() : "";
+        if (StrUtil.isEmpty(outNO)) {
+            return new HXResponse("订单号为空，请检查报文！");
+        }
         BillInfo billInfoValidate = billInfoMapper.selectByOutTradeOrderno(companyservice.getCompanyid(), outNO);
         if (BeanUtil.isNotEmpty(billInfoValidate)) {
             return new HXResponse("订单号不允许重复！！！");
-        }
+        }*/
         // end
 
         // 预处理：处理billinfo，计算税额等