From 0e70bb272dfcc553281f3baafdf8bd3c3ab8984a Mon Sep 17 00:00:00 2001 From: kane Date: Tue, 18 Jul 2023 18:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/impl/InvoiceCheckWebServiceImpl.java | 280 ++++-------------- 1 file changed, 54 insertions(+), 226 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 9b0f615..92e1fa6 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 @@ -316,7 +316,7 @@ public class InvoiceCheckWebServiceImpl { InvoiceCheck invoiceCheck = new InvoiceCheck(); invoiceCheck = EleCheckInvoiceImpl.handelCheckResult(invoiceCheck, resultContent); GetInvoiceVO getInvoiceVO = new GetInvoiceVO(); - //日期格式化 + // 远得日期格式化 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); String newKprq = ""; try { @@ -340,12 +340,26 @@ public class InvoiceCheckWebServiceImpl { getInvoiceVO.setZfbz("N"); getInvoiceVO.setHcbz("N"); } + // 远得返回信息封装 LinkedHashMap getInvoiceMap = new LinkedHashMap(); + getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); + getInvoiceMap.put("fphm",invoiceCheck.getFphm()); + getInvoiceMap.put("kprq",newKprq); + // 远得返回信息封装 + if (!InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl()) && + !InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); + getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); + getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); + getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); + getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); + getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); + getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); + getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); + } + // 远得类型返回信息封装 if (InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - //二手车相关结果 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); + // 二手车相关结果 getInvoiceMap.put("gfmc",invoiceCheck.getInvoiceCheckUsedCar().getMfdwgr()); getInvoiceMap.put("gfsh",invoiceCheck.getInvoiceCheckUsedCar().getMfdwdmsfzh()); String gfdzdh = invoiceCheck.getInvoiceCheckUsedCar().getMfdwgrdz() + " " + @@ -375,10 +389,7 @@ public class InvoiceCheckWebServiceImpl { getInvoiceMap.put("ZFBZ",invoiceCheck.getZfbz()); getInvoiceMap.put("bz",invoiceCheck.getBz()); } else if (InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - //机动车相关结果 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); + // 机动车相关结果 getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); @@ -408,163 +419,27 @@ public class InvoiceCheckWebServiceImpl { getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); getInvoiceMap.put("ZFBZ",invoiceCheck.getZfbz()); getInvoiceMap.put("sl",invoiceCheck.getInvoiceCheckCar().getSl()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - //卷票 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); - getInvoiceMap.put("bz",invoiceCheck.getBz()); - getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); - getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); - getInvoiceMap.put("jym",invoiceCheck.getJym()); - getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); - getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); - getInvoiceMap.put("bz",invoiceCheck.getBz()); - getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); - getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); - getInvoiceMap.put("jym",invoiceCheck.getJym()); - getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); - getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.TONG_XING_FEI_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); - getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); - getInvoiceMap.put("bz",invoiceCheck.getBz()); - getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); - getInvoiceMap.put("jym",invoiceCheck.getJym()); - getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); - getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 专票结果 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); + }else if (InvoiceType.ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.DIAN_ZI_ZHUAN_YONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())) { + // 专票 增值税普通发票 电子专用发票结果 getInvoiceMap.put("bz",invoiceCheck.getBz()); getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); getInvoiceMap.put("jym",invoiceCheck.getJym()); getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 电子普票 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); + }else if (InvoiceType.TONG_XING_FEI_FA_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){ getInvoiceMap.put("bz",invoiceCheck.getBz()); getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); getInvoiceMap.put("jym",invoiceCheck.getJym()); getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 增值税普通发票 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); - getInvoiceMap.put("bz",invoiceCheck.getBz()); - getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); - getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); - getInvoiceMap.put("jym",invoiceCheck.getJym()); - getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); - getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else if (InvoiceType.DIAN_ZI_ZHUAN_YONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())){ - // 电子专用发票 - getInvoiceMap.put("fpdm",invoiceCheck.getFpdm()); - getInvoiceMap.put("fphm",invoiceCheck.getFphm()); - getInvoiceMap.put("kprq",newKprq); - getInvoiceMap.put("gfmc",invoiceCheck.getGmfmc()); - getInvoiceMap.put("gfsh",invoiceCheck.getGmfsbh()); - getInvoiceMap.put("gfdzdh",invoiceCheck.getGmfdzdh()); - getInvoiceMap.put("Gfyhzh",invoiceCheck.getGmfyhzh()); - getInvoiceMap.put("Xfmc",invoiceCheck.getXhfmc()); - getInvoiceMap.put("Xfsh",invoiceCheck.getXhfsbh()); - getInvoiceMap.put("Xfdzdh",invoiceCheck.getXhfdzdh()); - getInvoiceMap.put("Xfyhzh",invoiceCheck.getXhfyhzh()); - getInvoiceMap.put("bz",invoiceCheck.getBz()); - getInvoiceMap.put("Jqbm",invoiceCheck.getJqbh()); - getInvoiceMap.put("Fplx",invoiceCheck.getFpzl()); - getInvoiceMap.put("jym",invoiceCheck.getJym()); - getInvoiceMap.put("HCBZ",getInvoiceVO.getHcbz()); - getInvoiceMap.put("ZFBZ",getInvoiceVO.getZfbz()); - getInvoiceVO.setFpje(invoiceCheck.getFpje()); - getInvoiceVO.setFpse(invoiceCheck.getFpse()); - getInvoiceVO.setJshj(invoiceCheck.getJshj()); - } else { - return buildResult(result, "999999", "暂不支持此票种查验，请检查！", null); } Element getInvoiceDoc = json2Element(result, "Fp", getInvoiceMap); // 详情获取 @@ -575,22 +450,30 @@ public class InvoiceCheckWebServiceImpl { for (InvoiceCheckDetail detail : details) { GetInvoiceSphVO getInvoiceSphVO = new GetInvoiceSphVO(); getInvoiceSphVO.setId(getInvoiceSphVO.getId() + count); - if (InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 卷票详情 + // 远得详情封装 + if (!InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl()) && + !InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){ getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); + } + // 远得详情封装 + if (InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { + // 卷票 电普 增值税普通发票 电子专用发票详情 getInvoiceSphVOMap.put("Ggxh",detail.getGgxh()); getInvoiceSphVOMap.put("Jldw",detail.getJldw()); - getInvoiceSphVOMap.put("Sl",detail.getSl()); + getInvoiceSphVOMap.put("Sl",detail.getSpsl()); getInvoiceSphVOMap.put("Dj",detail.getBhsdj()); getInvoiceSphVOMap.put("Je",detail.getJe()); getInvoiceSphVOMap.put("Se",detail.getSe()); getInvoiceSphVOMap.put("Slv",detail.getSl()); getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else if (InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 全电专票详情 - getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); - getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); + } else if (InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl()) || + InvoiceType.ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())|| + InvoiceType.DIAN_ZI_ZHUAN_YONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { + // 全电专票 全电普票 专票详情 getInvoiceSphVOMap.put("Ggxh",detail.getGgxh()); getInvoiceSphVOMap.put("Jldw",detail.getJldw()); getInvoiceSphVOMap.put("Sl",detail.getSpsl()); @@ -599,13 +482,8 @@ public class InvoiceCheckWebServiceImpl { getInvoiceSphVOMap.put("Slv",detail.getSl()); getInvoiceSphVOMap.put("Se",detail.getSe()); getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else if (InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 机动车没有详情 - getInvoiceSphVO.getLx(); } else if (InvoiceType.TONG_XING_FEI_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { // 通行发票 - getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); - getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); getInvoiceSphVOMap.put("cph",detail.getCph()); getInvoiceSphVOMap.put("cllx",detail.getLx()); getInvoiceSphVOMap.put("txrqq",detail.getTxrqq()); @@ -614,82 +492,32 @@ public class InvoiceCheckWebServiceImpl { getInvoiceSphVOMap.put("Se",detail.getSe()); getInvoiceSphVOMap.put("Slv",detail.getSl()); getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else if (InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 二手车没有详情 - getInvoiceVO.getFplx(); - } else if (InvoiceType.ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 专票详情 - getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); - getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); - getInvoiceSphVOMap.put("Ggxh",detail.getGgxh()); - getInvoiceSphVOMap.put("Jldw",detail.getJldw()); - getInvoiceSphVOMap.put("Sl",detail.getSpsl()); - getInvoiceSphVOMap.put("Dj",detail.getBhsdj()); - getInvoiceSphVOMap.put("Je",detail.getJe()); - getInvoiceSphVOMap.put("Slv",detail.getSl()); - getInvoiceSphVOMap.put("Se",detail.getSe()); - getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else if (InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 电子普票 - getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); - getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); - getInvoiceSphVOMap.put("Ggxh",detail.getGgxh()); - getInvoiceSphVOMap.put("Jldw",detail.getJldw()); - getInvoiceSphVOMap.put("Sl",detail.getSpsl()); - getInvoiceSphVOMap.put("Dj",detail.getBhsdj()); - getInvoiceSphVOMap.put("Je",detail.getJe()); - getInvoiceSphVOMap.put("Se",detail.getSe()); - getInvoiceSphVOMap.put("Slv",detail.getSl()); - getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else if (InvoiceType.ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 增值税普通发票 - getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); - getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); - getInvoiceSphVOMap.put("Ggxh",detail.getGgxh()); - getInvoiceSphVOMap.put("Jldw",detail.getJldw()); - getInvoiceSphVOMap.put("Sl",detail.getSpsl()); - getInvoiceSphVOMap.put("Dj",detail.getBhsdj()); - getInvoiceSphVOMap.put("Je",detail.getJe()); - getInvoiceSphVOMap.put("Se",detail.getSe()); - getInvoiceSphVOMap.put("Slv",detail.getSl()); - getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else if (InvoiceType.DIAN_ZI_ZHUAN_YONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())) { - // 电子专用发票 - getInvoiceSphVOMap.put("xh",String.valueOf(getInvoiceSphVO.getId())); - getInvoiceSphVOMap.put("Spmc",detail.getHwmc()); - getInvoiceSphVOMap.put("Ggxh",detail.getGgxh()); - getInvoiceSphVOMap.put("Jldw",detail.getJldw()); - getInvoiceSphVOMap.put("Sl",detail.getSpsl()); - getInvoiceSphVOMap.put("Dj",detail.getBhsdj()); - getInvoiceSphVOMap.put("Je",detail.getJe()); - getInvoiceSphVOMap.put("Se",detail.getSe()); - getInvoiceSphVOMap.put("Slv",detail.getSl()); - getInvoiceSphVOMap.put("Taxcode",detail.getSsflbm()); - } else { - return buildResult(result, "999999", "暂不支持此票种查验，请检查！", null); } - Element sphElement = json2Element(result, "Sph", getInvoiceSphVOMap); - getInvoiceDoc.appendChild(sphElement); - count++; + if (!InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl()) && + !InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + Element sphElement = json2Element(result, "Sph", getInvoiceSphVOMap); + getInvoiceDoc.appendChild(sphElement); + count++; + } } } // 尾部标签添加 if (!InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){ // je标签添加 LinkedHashMap jeLinkedHashMap = new LinkedHashMap<>(); - jeLinkedHashMap.put("je",getInvoiceVO.getFpje()); + jeLinkedHashMap.put("je",invoiceCheck.getFpje()); Element je = jsonElement(result, "je", jeLinkedHashMap); getInvoiceDoc.appendChild(je); // se标签添加 LinkedHashMap seLinkedHashMap = new LinkedHashMap<>(); - seLinkedHashMap.put("se",getInvoiceVO.getFpse()); + seLinkedHashMap.put("se",invoiceCheck.getFpse()); Element se = jsonElement(result, "se", seLinkedHashMap); getInvoiceDoc.appendChild(se); // jshj标签添加 LinkedHashMap jshjLinkedHashMap = new LinkedHashMap<>(); - jshjLinkedHashMap.put("jshj",getInvoiceVO.getJshj()); + jshjLinkedHashMap.put("jshj",invoiceCheck.getJshj()); Element jshj = jsonElement(result, "jshj", jshjLinkedHashMap); getInvoiceDoc.appendChild(jshj); } @@ -765,4 +593,4 @@ public class InvoiceCheckWebServiceImpl { // } // return webServiceRespVO; // } -} +} \ No newline at end of file