base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java

@@ -1,6 +1,5 @@
 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;
@@ -9,7 +8,6 @@ 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;
 
@@ -111,10 +109,7 @@ public class ElecFlightInvoiceAssembler implements ParamAssembler{
                         flightItem.setSl("");//数量
                         flightItem.setDj("");//单价
                         flightItem.setJe(planeticketH.getPT_PRICE());//金额
-                        if (StrUtil.isEmpty(planeticketH.getPT_TAXRATE())){
-                            planeticketH.setPT_TAXRATE(null);
-                        }
-                        flightItem.setSlv(Convert.toBigDecimal(planeticketH.getPT_TAXRATE()));//税率
+                        flightItem.setSlv(planeticketH.getPT_TAXRATE());//税率
                         flightItem.setSe(planeticketH.getPT_TAXAMOUNT());//税额
                     }
                     filightItemList.add(flightItem);
@@ -123,9 +118,4 @@ public class ElecFlightInvoiceAssembler implements ParamAssembler{
         }
         return param;
     }
-
-    public static void main(String[] args) {
-        BigDecimal bigDecimal = Convert.toBigDecimal(null);
-        System.out.println(bigDecimal);
-    }
 }

base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml

@@ -19,7 +19,7 @@
             <if test="id != null and id != ''">f.id = #{id}</if>
             <if test="bill_code != null and bill_code != ''">and f.bill_code = #{bill_code}</if>
             and push_status is null
-            -- and start_date >= '2025-05-26'
+            and start_date >= '2025-05-26'
         </trim>
     </select>
 

base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java

@@ -77,7 +77,7 @@ public class LexmiscivPlaneticketEntity extends BaseEntity {
     /**
      * 无备注
      */
-    private String PT_TAXRATE;
+    private BigDecimal PT_TAXRATE;
     /**
      * 无备注
      */
@@ -387,11 +387,11 @@ public class LexmiscivPlaneticketEntity extends BaseEntity {
         return PT_AMOUNT;
     }
 
-    public String getPT_TAXRATE() {
+    public BigDecimal getPT_TAXRATE() {
         return PT_TAXRATE;
     }
 
-    public void setPT_TAXRATE(String PT_TAXRATE) {
+    public void setPT_TAXRATE(BigDecimal PT_TAXRATE) {
         this.PT_TAXRATE = PT_TAXRATE;
     }
 

base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java

@@ -88,7 +88,6 @@ 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);