From 2bb2866d5483c5205b24fb6640bc9d73bb310cb8 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Wed, 28 May 2025 18:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assembler/ElecFlightInvoiceAssembler.java        | 12 +++++++++++-
 .../lexmis/entity/LexmiscivPlaneticketEntity.java    |  6 +++---
 .../impl/CInvoiceImportPluginServiceImpl.java        |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java
index de8aaa1e..17d0e2ba 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java
@@ -1,5 +1,6 @@
 package com.hzya.frame.plugin.cinvoice.assembler;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -8,6 +9,7 @@ import com.hzya.frame.plugin.cinvoice.lexmis.entity.LexmiscivPlaneticketEntity;
 import com.hzya.frame.plugin.cinvoice.lexmis.entity.LexmiscivPlaneticketsEntity;
 import org.apache.commons.collections.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -109,7 +111,10 @@ public class ElecFlightInvoiceAssembler implements ParamAssembler{
                         flightItem.setSl("");//数量
                         flightItem.setDj("");//单价
                         flightItem.setJe(planeticketH.getPT_PRICE());//金额
-                        flightItem.setSlv(planeticketH.getPT_TAXRATE());//税率
+                        if (StrUtil.isEmpty(planeticketH.getPT_TAXRATE())){
+                            planeticketH.setPT_TAXRATE(null);
+                        }
+                        flightItem.setSlv(Convert.toBigDecimal(planeticketH.getPT_TAXRATE()));//税率
                         flightItem.setSe(planeticketH.getPT_TAXAMOUNT());//税额
                     }
                     filightItemList.add(flightItem);
@@ -118,4 +123,9 @@ public class ElecFlightInvoiceAssembler implements ParamAssembler{
         }
         return param;
     }
+
+    public static void main(String[] args) {
+        BigDecimal bigDecimal = Convert.toBigDecimal(null);
+        System.out.println(bigDecimal);
+    }
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java
index c0457b9b..c69364ce 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java
@@ -77,7 +77,7 @@ public class LexmiscivPlaneticketEntity extends BaseEntity {
     /**
      * 无备注
      */
-    private BigDecimal PT_TAXRATE;
+    private String PT_TAXRATE;
     /**
      * 无备注
      */
@@ -387,11 +387,11 @@ public class LexmiscivPlaneticketEntity extends BaseEntity {
         return PT_AMOUNT;
     }
 
-    public BigDecimal getPT_TAXRATE() {
+    public String getPT_TAXRATE() {
         return PT_TAXRATE;
     }
 
-    public void setPT_TAXRATE(BigDecimal PT_TAXRATE) {
+    public void setPT_TAXRATE(String PT_TAXRATE) {
         this.PT_TAXRATE = PT_TAXRATE;
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java
index a591d4dc..a5d4a45c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java
@@ -88,6 +88,7 @@ public class CInvoiceImportPluginServiceImpl implements ICInvoiceImportPluginSer
             //2、 查OA明细表
             //3、 查迈瑞思发票表
             //迈锐思发票公共信息表
+            logger.info("开始查迈锐思发票公共表信息:{},{}",cInvoiceH.getId(),cInvoiceH.getBill_code());
             LexmisPublicinfoEntity lexmisPublicinfoEntity = new LexmisPublicinfoEntity(cInvoiceH.getId(), dataSourceCode);
             //lexmisPublicinfoEntity.setPI_ID("6952494198841691018");
             List<LexmisPublicinfoEntity> lexmisPublicinfoEntityList = lexmisPublicinfoService.query(lexmisPublicinfoEntity);