From 74366555fdda9b27a4f996e9dc80d6c3df95f565 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Thu, 15 Jun 2023 17:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E7=A8=8E=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../income/domain/entity/InvoiceCheck.java | 5 +++ .../domain/entity/InvoiceCheckDetail.java | 23 ++++++++++ .../domain/entity/InvoiceCheckHangkong.java | 32 ++++++++++++++ .../domain/entity/InvoiceCheckTielu.java | 43 +++++++++++++++++++ .../service/impl/EleCheckInvoiceImpl.java | 25 ++++++++++- 5 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckHangkong.java create mode 100644 jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckTielu.java diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheck.java b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheck.java index b7b3818..9db5fc4 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheck.java +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheck.java @@ -128,6 +128,11 @@ public class InvoiceCheck extends BaseEntity // 二手车子类 private InvoiceCheckUsedCar invoiceCheckUsedCar; + //处理电子发票（航空运输电子客票行程单） + private InvoiceCheckHangkong invoiceCheckHangkong; + + // 处理电子发票（铁路电子客票） + private InvoiceCheckTielu invoiceCheckTielu; @Override public String toString() { return "InvoiceCheck{" + diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckDetail.java b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckDetail.java index b831ffb..34a76d2 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckDetail.java +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckDetail.java @@ -52,4 +52,27 @@ public class InvoiceCheckDetail { //税收分类简码名称 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/entity/InvoiceCheckHangkong.java b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckHangkong.java new file mode 100644 index 0000000..6b4a23a --- /dev/null +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckHangkong.java @@ -0,0 +1,32 @@ +package com.jianshui.income.domain.entity; + +import lombok.Data; + +/** +* @Author: kk +* @Description: 航空运输电子客票行程单 +* @DateTime: 2023/6/15 16:27 +* @Params: +* @Return +*/ + +@Data +public class InvoiceCheckHangkong { + // invoice_check表的id + private int invoice_check_id; + + // 姓名 + private String xm; + + // 证件号码 + private String zjhm; + + // 电子客票号 + private String dzkph; + + // 国内国际标识 + private String gngjbs; + // GP 单号 + private String gpdh; + +} diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckTielu.java b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckTielu.java new file mode 100644 index 0000000..26d52af --- /dev/null +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckTielu.java @@ -0,0 +1,43 @@ +package com.jianshui.income.domain.entity; + +import lombok.Data; + +/** + * @Description invoice 二手车 + * @Author 巩权林 + * @Date 2021/4/16 10:34 + **/ +@Data +public class InvoiceCheckTielu { + // invoice_check表的id + private int invoice_check_id; + + // 业务类型 + 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 dzkph; + // 空调特征 + private String kttz; +} diff --git a/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleCheckInvoiceImpl.java b/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleCheckInvoiceImpl.java index 3ce1df5..6f9acd9 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleCheckInvoiceImpl.java +++ b/jianshui-income/src/main/java/com/jianshui/income/service/impl/EleCheckInvoiceImpl.java @@ -1,6 +1,8 @@ package com.jianshui.income.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jianshui.common.core.domain.AjaxResult; @@ -834,6 +836,12 @@ public class EleCheckInvoiceImpl implements ICheckInvoice { invoiceCheckUsedCar.setCllx(resultContent.getString("cllx")); invoiceCheckUsedCar.setCpxh(resultContent.getString("cpxh")); + // 处理电子发票（航空运输电子客票行程单） + InvoiceCheckHangkong hangkong = BeanUtil.copyProperties(JSONUtil.parse(resultContent),InvoiceCheckHangkong.class); + + // 处理电子发票（铁路电子客票） + InvoiceCheckTielu tielu = BeanUtil.copyProperties(JSONUtil.parse(resultContent),InvoiceCheckTielu.class); + // 获取详情子类 int invoiceId = invoiceCheck.getId(); JSONArray detailsJsonArray = resultContent.getJSONArray("detailList"); @@ -859,6 +867,13 @@ public class EleCheckInvoiceImpl implements ICheckInvoice { tempDetail.setLx(detailData.getString("lx")); tempDetail.setTxrqq(detailData.getString("txrqq")); tempDetail.setTxrqz(detailData.getString("txrqz")); + + + // 处理电子发票（航空运输电子客票行程单） + // 处理电子发票（铁路电子客票） + BeanUtil.copyProperties(detailData,tempDetail); + + detailList.add(tempDetail); } } @@ -876,6 +891,12 @@ public class EleCheckInvoiceImpl implements ICheckInvoice { if (invoiceCheckUsedCar != null) { invoiceCheck.setInvoiceCheckUsedCar(invoiceCheckUsedCar); } + if (hangkong != null) { + invoiceCheck.setInvoiceCheckHangkong(hangkong); + } + if (tielu != null) { + invoiceCheck.setInvoiceCheckTielu(tielu); + } if (detailList != null && detailList.size() > 0) { invoiceCheck.setInvoiceCheckDetail(detailList); } @@ -957,7 +978,9 @@ public class EleCheckInvoiceImpl implements ICheckInvoice { "02".equals(fpzl) || // 货运运输业增值税专用发票：02 "03".equals(fpzl) || // 机动车销售统一发票：03 "15".equals(fpzl) || // 二手车发票：15 - "08".equals(fpzl) // 增值税电子专用发票：08 + "08".equals(fpzl) || // 增值税电子专用发票：08 + "61".equals(fpzl) || // 电子发票（航空运输电子客票行程单）：61 + "83".equals(fpzl) // 电子发票（铁路电子客票）：08 ) { if ((String) data.get("fpje") == null) { return AjaxResult.error("不含税金额不能为空！");