查验bug修复

jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java

@@ -21,6 +21,7 @@ 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;
+import com.jianshui.platform.enums.InvoiceType;
 import com.jianshui.system.domain.CompanyserviceProp;
 import com.jianshui.system.service.ICompanyservicePropService;
 import com.jianshui.system.service.ICompanyserviceService;
@@ -317,7 +318,8 @@ public class InvoiceCheckWebServiceImpl {
         } catch (ParseException e) {
            new JianshuiServiceException("日期转换错误");
         }
-        if ("15".equals(invoiceCheck.getFpzl())){
+        String fpzl = invoiceCheck.getFpzl();
+        if (InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){
             //二手车相关结果
             getInvoiceVO.setGfdz(invoiceCheck.getInvoiceCheckUsedCar().getMfdwgrdz());
             getInvoiceVO.setGfdh(invoiceCheck.getInvoiceCheckUsedCar().getMfdh());
@@ -327,7 +329,7 @@ public class InvoiceCheckWebServiceImpl {
             getInvoiceVO.setNsrsbh(invoiceCheck.getInvoiceCheckUsedCar().getJypmdwzsbh());
             BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckUsedCar(),getInvoiceVO);
             getInvoiceVO.setKprq(newKprq);
-        }else if ("03".equals(invoiceCheck.getFpzl())){
+        }else if (InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){
             //机动车相关结果
             getInvoiceVO.setHgzh(invoiceCheck.getInvoiceCheckCar().getHgzs());
             getInvoiceVO.setJkzmsh(invoiceCheck.getInvoiceCheckCar().getJszmsh());
@@ -335,7 +337,7 @@ public class InvoiceCheckWebServiceImpl {
             getInvoiceVO.setDh(invoiceCheck.getInvoiceCheckCar().getSmfdh());
             BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckCar(),getInvoiceVO);
             getInvoiceVO.setKprq(newKprq);
-        }else if ("11".equals(invoiceCheck.getFpzl())){
+        }else if (InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())){
             //卷票
             getInvoiceVO.setFpdm(invoiceCheck.getFpdm());
             getInvoiceVO.setFphm(invoiceCheck.getFphm());
@@ -356,6 +358,27 @@ public class InvoiceCheckWebServiceImpl {
             getInvoiceVO.setFpse(invoiceCheck.getFpse());
             getInvoiceVO.setJshj(invoiceCheck.getJshj());
             getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
+        }else if (InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){
+            getInvoiceVO.setFpdm(invoiceCheck.getFpdm());
+            getInvoiceVO.setFphm(invoiceCheck.getFphm());
+            getInvoiceVO.setKprq(newKprq);
+            getInvoiceVO.setGmfmc(invoiceCheck.getGmfmc());
+            getInvoiceVO.setGmfsbh(invoiceCheck.getGmfsbh());
+            getInvoiceVO.setGmfdzdh(invoiceCheck.getGmfdzdh());
+            getInvoiceVO.setGmfyhzh(invoiceCheck.getGmfyhzh());
+            getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
+            getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
+            getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
+            getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
+            getInvoiceVO.setBz(invoiceCheck.getBz());
+            getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
+            getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
+            getInvoiceVO.setFpzl(invoiceCheck.getFpzl());
+            getInvoiceVO.setJym(invoiceCheck.getJym());
+            getInvoiceVO.setFpje(invoiceCheck.getFpje());
+            getInvoiceVO.setFpse(invoiceCheck.getFpse());
+            getInvoiceVO.setJshj(invoiceCheck.getJshj());
+            getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
         }else {
             //通用结果
             getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
@@ -388,13 +411,15 @@ public class InvoiceCheckWebServiceImpl {
         if (CollectionUtil.isNotEmpty(details)) {
             for (InvoiceCheckDetail detail : details) {
                 GetInvoiceSphVO getInvoiceSphVO = new GetInvoiceSphVO();
-                if ("11".equals(invoiceCheck.getFpzl())){
+                if (InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())){
                     getInvoiceSphVO.setHwmc(detail.getHwmc());
                     getInvoiceSphVO.setGgxh(detail.getGgxh());
                     getInvoiceSphVO.setJldw(detail.getJldw());
                     getInvoiceSphVO.setSl(detail.getSl());
                     getInvoiceSphVO.setBhsdj(detail.getBhsdj());
+                    // 含税金额
                     getInvoiceSphVO.setHsje(detail.getHsje());
+                    // 不含税金额
                     getInvoiceSphVO.setBhsje(detail.getJe());
                     getInvoiceSphVO.setSe(detail.getSe());
                     getInvoiceSphVO.setSl(detail.getSl());
@@ -403,10 +428,24 @@ public class InvoiceCheckWebServiceImpl {
                     getInvoiceSphVO.setTxrqq(detail.getTxrqq());
                     getInvoiceSphVO.setCph(detail.getCph());
                     getInvoiceSphVOList.add(getInvoiceSphVO);
+                }else if (InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){
+                    getInvoiceSphVO.setHwmc(detail.getHwmc());
+                    getInvoiceSphVO.setGgxh(detail.getGgxh());
+                    getInvoiceSphVO.setJldw(detail.getJldw());
+                    getInvoiceSphVO.setSl(detail.getSl());
+                    getInvoiceSphVO.setBhsdj(detail.getBhsdj());
+                    getInvoiceSphVO.setBhsje(detail.getJe());
+                    getInvoiceSphVO.setSl(detail.getSl());
+                    getInvoiceSphVO.setSe(detail.getSe());
+                    getInvoiceSphVO.setSsflbm(detail.getSsflbm());
+                    getInvoiceSphVO.setSpsl(detail.getSpsl());
+                    getInvoiceSphVOList.add(getInvoiceSphVO);
                 }else {
                     getInvoiceSphVO.setSsflbm(detail.getSpbmjc());
                     BeanUtils.copyProperties(detail, getInvoiceSphVO);
+                    // 含税金额
                     getInvoiceSphVO.setBhsje(detail.getJe());
+                    // 不含税金额
                     getInvoiceSphVO.setHsje(detail.getHsje());
                     getInvoiceSphVOList.add(getInvoiceSphVO);
                 }

jianshui-income/src/main/java/com/jianshui/income/domain/entity/InvoiceCheckDetail.java

@@ -52,6 +52,9 @@ public class InvoiceCheckDetail {
     //税收分类简码名称
     private String spbmjc;
 
+    //税收分类编码
+    private String ssflbm;
+
     // 处理电子发票（航空运输电子客票行程单）
     // 处理电子发票（铁路电子客票）
 

jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java

@@ -46,7 +46,7 @@ public class GetInvoiceVO {
     @JSONField(name = "cycs")
     private String cycs;
     // 销售方名称
-    @JSONField(name = "Xhfmc")
+    @JSONField(name = "Xfmc")
     private String xfmc;
     // 销售方识别号
     @JSONField(name = "Xfsh")

jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java

@@ -7,7 +7,13 @@ package com.jianshui.platform.enums;
 public enum InvoiceType {
 
     SHU_DIAN_ZHUAN_PIAO("1", "数电专票"),
-    SHU_DIAN_PU_PIAO("2", "数电普票");
+    SHU_DIAN_PU_PIAO("2", "数电普票"),
+    JUAN_PIAO("11", "卷票"),
+    JI_DONG_CHE_PIAO("03", "机动车票"),
+    ER_SHOU_CHE_PIAO("15", "二手车票"),
+    QUAN_DIAN_PU_PIAO("22", "全电普票"),
+    QUAN_DIAN_ZHUAN_PIAO("21", "全电专票");
+
 
     private String code;
     private String displayName;