发票查验

2 years ago · 2b7a6c082d
parent 98fdf9a135
commit 2b7a6c082d
3 changed files with 98 additions and 43 deletions
--- 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
@ -306,12 +306,24 @@ public class InvoiceCheckWebServiceImpl {
        InvoiceCheck invoiceCheck = new InvoiceCheck();
        invoiceCheck = EleCheckInvoiceImpl.handelCheckResult(invoiceCheck, resultContent);
        GetInvoiceVO getInvoiceVO = new GetInvoiceVO();
+        //二手车相关结果
+        getInvoiceVO.setGfdz(invoiceCheck.getInvoiceCheckUsedCar().getMfdwgrdz());
+        getInvoiceVO.setGfdh(invoiceCheck.getInvoiceCheckUsedCar().getMfdh());
+        getInvoiceVO.setXfdz(invoiceCheck.getInvoiceCheckUsedCar().getSmfdwgrzz());
+        getInvoiceVO.setCjh(invoiceCheck.getInvoiceCheckUsedCar().getClsbh());
+        getInvoiceVO.setZrdclglsmc(invoiceCheck.getInvoiceCheckUsedCar().getZrdcgsmc());
+        getInvoiceVO.setNsrsbh(invoiceCheck.getInvoiceCheckUsedCar().getJypmdwzsbh());
+        //机动车相关结果
+        getInvoiceVO.setHgzh(invoiceCheck.getInvoiceCheckCar().getHgzs());
+        getInvoiceVO.setJkzmsh(invoiceCheck.getInvoiceCheckCar().getJszmsh());
+        getInvoiceVO.setZh(invoiceCheck.getInvoiceCheckCar().getKhzh());
+        getInvoiceVO.setDh(invoiceCheck.getInvoiceCheckCar().getSmfdh());
+        //通用结果
        getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
        getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
        getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
        getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
        BeanUtils.copyProperties(invoiceCheck, getInvoiceVO);
-
        BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckCar(),getInvoiceVO);
        BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckUsedCar(),getInvoiceVO);
        BeanUtils.copyProperties(invoiceCheck.getInvoiceCheckToll(),getInvoiceVO);
@ -336,6 +348,7 @@ public class InvoiceCheckWebServiceImpl {
        if (CollectionUtil.isNotEmpty(details)) {
            for (InvoiceCheckDetail detail : details) {
                GetInvoiceSphVO getInvoiceSphVO = new GetInvoiceSphVO();
+                getInvoiceSphVO.setSsflbm(detail.getSpbmjc());
                BeanUtils.copyProperties(detail, getInvoiceSphVO);
                getInvoiceSphVOList.add(getInvoiceSphVO);
            }
--- 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
@ -47,13 +47,13 @@ public class GetInvoiceSphVO {
    // 费用项目  货运发票返回信息
 //    private String fyxm;
    // 车牌号  通行费发票返回信息
-//    private String cph;
+    private String cph;
    // 类型  通行费发票返回信息
-//    private String lx;
+    private String lx;
    // 通行日期起  通行费发票返回信息
-//    private String txrqq;
+    private String txrqq;
    // 通行日起止  通行费发票返回信息
-//    private String txrqz;
+    private String txrqz;
    //商品编码
    @JSONField(name = "Taxcode")
    private String ssflbm;
--- 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
@ -2,7 +2,6 @@ package com.jianshui.income.domain.vo.render;

 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jianshui.income.domain.entity.InvoiceCheckDetail;
 import lombok.Data;

 import java.util.Date;
@ -174,8 +173,8 @@ public class GetInvoiceVO {
 //    @JSONField(name = "mfdwgr")
 //    private String mfdwgr;

-//    @JSONField(name = "djzh")
-//    private String djzh;
+    @JSONField(name = "djzh")
+    private String djzh;

 //    @JSONField(name = "cyjg")
 //    private String cyjg;
@ -183,50 +182,48 @@ public class GetInvoiceVO {
    @JSONField(name = "smfdwgr")
    private String smfdwgr;

-//    @JSONField(name = "cpxh")
-//    private String cpxh;
+    @JSONField(name = "cpxh")
+    private String cpxh;

-//    @JSONField(name = "escsc")
-//    private String escsc;
+    @JSONField(name = "escsc")
+    private String escsc;

 //    @JSONField(name = "cycs")
 //    private String cycs;

-//    @JSONField(name = "mfdwgrdz")
-//    private String mfdwgrdz;
-
-
+    @JSONField(name = "Gfdz")
+    private String gfdz;

 //    @JSONField(name = "clsbh")
 //    private String clsbh;

-//    @JSONField(name = "smfdh")
-//    private String smfdh;
+    @JSONField(name = "smfdh")
+    private String smfdh;

-//    @JSONField(name = "escscdz")
-//    private String escscdz;
+    @JSONField(name = "Escscdz")
+    private String escscdz;

 //    @JSONField(name = "smfdwgrzz")
 //    private String smfdwgrzz;

 //    @JSONField(name = "smfdwdmsfzh")
 //    private String smfdwdmsfzh;
-//    @JSONField(name = "escscdh")
-//    private String escscdh;
-//    @JSONField(name = "cpzh")
-//    private String cpzh;
+    @JSONField(name = "escscdh")
+    private String escscdh;
+    @JSONField(name = "cpzh")
+    private String cpzh;

 //    @JSONField(name = "escsckhyhzh")
 //    private String escsckhyhzh;

-//    @JSONField(name = "cjhj")
-//    private String cjhj;
+    @JSONField(name = "cjhj")
+    private String cjhj;

    @JSONField(name = "xdpbz")
    private String xdpbz;

-//    @JSONField(name = "cllx")
-//    private String cllx;
+    @JSONField(name = "cllx")
+    private String cllx;

    @JSONField(name = "qdbz")
    private String qdbz;
@ -234,17 +231,25 @@ public class GetInvoiceVO {
    @JSONField(name = "cpybz")
    private String cpybz;

-//    @JSONField(name = "zrdcgsmc")
-//    private String zrdcgsmc;
+    @JSONField(name = "zrdcgsmc")
+    private String zrdcgsmc;

-//    @JSONField(name = "escscsbh")
-//    private String escscsbh;
+    @JSONField(name = "escscsbh")
+    private String escscsbh;

 //    @JSONField(name = "mfdwdmsfzh")
 //    private String mfdwdmsfzh;

-//    @JSONField(name = "mfdh")
-//    private String mfdh;
+    @JSONField(name = "Gfdh")
+    private String Gfdh;
+
+    @JSONField(name = "Cjh")
+    private String cjh;
+    @JSONField(name = "Zrdclglsmc")
+    private String zrdclglsmc;
+    @JSONField(name = "Nsrsbh")
+    private String nsrsbh;
+

    // 二手车 end

@ -255,14 +260,14 @@ public class GetInvoiceVO {
 //    @JSONField(name = "hgzs")
 //    private String hgzs;

-//    @JSONField(name = "xcrs")
-//    private String xcrs;
+    @JSONField(name = "xcrs")
+    private String xcrs;

    @JSONField(name = "sl")
    private String sl;

-//    @JSONField(name = "cd")
-//    private String cd;
+    @JSONField(name = "cd")
+    private String cd;

 //    @JSONField(name = "skph")
 //    private String skph;
@ -276,16 +281,53 @@ public class GetInvoiceVO {
    @JSONField(name = "jdcbz")
    private String jdcbz;

-//    @JSONField(name = "zgswjgmc")
-//    private String zgswjgmc;
+    @JSONField(name = "zgswjgmc")
+    private String zgswjgmc;

-//    @JSONField(name = "zgswjgdm")
-//    private String zgswjgdm;
+    @JSONField(name = "zgswjgdm")
+    private String zgswjgdm;

 //    @JSONField(name = "fdjhm")
 //    private String fdjhm;
+    //机动车合格证书号
+    @JSONField(name = "Hgzh")
+    private String hgzh;
+
+    //进口证书号
+    @JSONField(name = "Jkzmsh")
+    private String jkzmsh;
+
+    //商检单号
+    @JSONField(name = "Sjdh")
+    private String sjdh;
+    //发送机号码
+    @JSONField(name = "Fdjhm")
+    private String fdjhm;
+    //车辆识别代号
+    @JSONField(name = "Clsbdh")
+    private String clsbdh;
+    // 完税凭证号码  机动车发票返回该信息`
+    @JSONField(name = "Wspzhm")
+    private String wspzhm;
+
+    // 吨位  机动车发票返回该信息`
+    @JSONField(name = "Dw")
+    private String dw;
+
+    // 电话
+    @JSONField(name = "Dh")
+    private String dh;
+    // 地址
+    @JSONField(name = "Dz")
+    private String dz;
+    // 开户银行
+    @JSONField(name = "Khyh")
+    private String khyh;
+
+    // 账号
+    @JSONField(name = "Zh")
+    private String zh;

    // 机动车发票end

-
 }