From 95f0e1c7082dcc8b02deeac2f35b4a6f62405bce Mon Sep 17 00:00:00 2001
From: kane <kane@qq.com>
Date: Fri, 16 Jun 2023 18:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=9F=A5=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/impl/InvoiceCheckWebServiceImpl.java   |  5 +--
 .../domain/vo/render/GetInvoiceSphVO.java     | 19 +++++++++
 .../income/domain/vo/render/GetInvoiceVO.java | 42 +++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
index 966e2ee..016914a 100644
--- a/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
+++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
@@ -16,7 +16,6 @@ import com.jianshui.common.utils.ToLowerBeanUtil;
 import com.jianshui.income.domain.entity.InvoiceCheck;
 import com.jianshui.income.domain.entity.InvoiceCheckDetail;
 import com.jianshui.income.domain.vo.render.*;
-
 import com.jianshui.income.factory.ICheckServiceFactory;
 import com.jianshui.income.service.ICheckInvoice;
 import com.jianshui.income.service.impl.EleCheckInvoiceImpl;
@@ -31,7 +30,6 @@ import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
@@ -328,7 +326,8 @@ public class InvoiceCheckWebServiceImpl {
         BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckUsedCar(),getInvoiceVO);
         BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckToll(),getInvoiceVO);
         BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckFreight(),getInvoiceVO);
-
+        BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckHangkong(),getInvoiceVO);
+        BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckTielu(),getInvoiceVO);
 
         String zfbz = getInvoiceVO.getZfbz();
         if (StringUtils.equals(zfbz, "Y")) {
diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java
index ab928be..b2e4bbc 100644
--- a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java
+++ b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java
@@ -59,4 +59,23 @@ public class GetInvoiceSphVO {
     private String ssflbm;
     //税收分类简码名称
 //    private String spbmjc;
+
+    //    航段
+    private String hd;
+    //始发站
+    private String sfz;
+    //目的  站
+    private String mdz;
+    //承运人
+    private String cyr;
+    //航班号
+    private String hbh;
+    //座位等级
+    private String zwdj;
+    //承运日期
+    private String cyrq;
+    //        起飞时间
+    private String qfsj;
+    //客票级别
+    private String kpjb;
 }
diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java
index 859f5e8..095aa34 100644
--- a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java
+++ b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java
@@ -330,4 +330,46 @@ public class GetInvoiceVO {
 
     // 机动车发票end
 
+    //航空  start
+
+    // 电子客票号
+    private String dzkph;
+
+    // 国内国际标识
+    private String gngjbs;
+    // GP 单号
+    private String gpdh;
+    //航空  end
+
+
+
+    //铁路 start
+    // 业务类型
+    private String ywlx;
+    // 姓名
+    private String xm;
+    // 证件号码
+    private String zjhm;
+    // 出发站
+    private String cfz;
+    // 到达站
+    private String ddz;
+    // 车次
+    private String cc;
+    // 乘车日期
+    private String ccrq;
+    // 出发时间
+    private String cfsj;
+    // 席别
+    private String xb;
+    // 车厢
+    private String cx;
+    // 席位
+    private String xw;
+    // 票种
+    private String pz;
+    // 空调特征
+    private String kttz;
+    //铁路 end
+
 }