发票查验结果

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

@@ -306,6 +306,10 @@ public class InvoiceCheckWebServiceImpl {
         InvoiceCheck invoiceCheck = new InvoiceCheck();
         invoiceCheck = EleCheckInvoiceImpl.handelCheckResult(invoiceCheck, resultContent);
         GetInvoiceVO getInvoiceVO = new GetInvoiceVO();
+        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);
@@ -364,7 +368,10 @@ public class InvoiceCheckWebServiceImpl {
         jsonObject.keySet().forEach(key -> {
             String value = jsonObject.getString(key);
             // 转为全小写
-            key = key.toLowerCase();
+            String firstKey = key.substring(0, 1);
+            String upperKey = firstKey.toUpperCase();
+            String endKey = key.substring(1, key.length());
+            key = upperKey + endKey.toLowerCase();
             Element element = result.createElement(key);
             element.setTextContent(value);
             // result.appendChild(element);

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

@@ -13,9 +13,9 @@ public class GetInvoiceSphVO {
     @JSONField(name = "Xh")
     private int id;
     // invoice_check表的id
-    private int invoice_check_id;
+//    private int invoice_check_id;
     // 明细编号
-    private String mxbh;
+//    private String mxbh;
     // 货物名称
     @JSONField(name = "Spmc")
     private String hwmc;
@@ -31,7 +31,7 @@ public class GetInvoiceSphVO {
     @JSONField(name = "Se")
     private String se;
     // 含税单价
-    private String hsdj;
+//    private String hsdj;
     // 含税金额
     @JSONField(name = "Je")
     private String hsje;
@@ -45,18 +45,18 @@ public class GetInvoiceSphVO {
     @JSONField(name = "Jldw")
     private String jldw;
     // 费用项目  货运发票返回信息
-    private String fyxm;
+//    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;
     //税收分类简码名称
-    private String spbmjc;
+//    private String spbmjc;
 }

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

@@ -23,14 +23,17 @@ public class GetInvoiceVO {
     private String company_id;
     // 批次号
 
+    //税收分类编码
+    @JSONField(name = "TaxCode")
+    private String taxcode;
     @JSONField(name = "pch")
     private String pch;
     // 查验结果
     @JSONField(name = "cyjg")
     private String cyjg;
     // 查验结果信息   查询结果的信息
-    @JSONField(name = "cyjgxx")
+//    @JSONField(name = "cyjgxx")
-    private String cyjgxx;
+//    private String cyjgxx;
     // 发票种类
     @JSONField(name = "Fplx") // 单独处理
     private String fpzl;
@@ -53,13 +56,13 @@ public class GetInvoiceVO {
     @JSONField(name = "Xfdzdh")
     private String xfdzdh;
     // 销售方地址 2022.09.16 浪潮要求新增需求
-    @JSONField(name = "Xfyhzh")
+    @JSONField(name = "Xfdz")
     private String xfdz;
     // 销售方电话 2022.09.16 浪潮要求新增需求
     @JSONField(name = "xhfdh")
     private String xfdh;
     // 销售方开户行
-    @JSONField(name = "Xfdzdh")
+    @JSONField(name = "Xfyhzh")
     private String xfyhzh;
     // 购买方识别号
     @JSONField(name = "Gfsh")
@@ -93,14 +96,14 @@ public class GetInvoiceVO {
     @JSONField(name = "Jqbm")
     private String jqbh;
     // 开票人
-    @JSONField(name = "kpr")
+//    @JSONField(name = "kpr")
-    private String kpr;
+//    private String kpr;
 //     收款人
-    @JSONField(name = "skr")
+//    @JSONField(name = "skr")
-    private String skr;
+//    private String skr;
 //     复核人
-    @JSONField(name = "fhr")
+//    @JSONField(name = "fhr")
-    private String fhr;
+//    private String fhr;
     // 校验码
     @JSONField(name = "JYM")
     private String jym;
@@ -168,11 +171,11 @@ public class GetInvoiceVO {
 
     // 二手车 start
 
-    @JSONField(name = "mfdwgr")
+//    @JSONField(name = "mfdwgr")
-    private String mfdwgr;
+//    private String mfdwgr;
 
-    @JSONField(name = "djzh")
+//    @JSONField(name = "djzh")
-    private String djzh;
+//    private String djzh;
 
 //    @JSONField(name = "cyjg")
 //    private String cyjg;
@@ -180,48 +183,50 @@ public class GetInvoiceVO {
     @JSONField(name = "smfdwgr")
     private String smfdwgr;
 
-    @JSONField(name = "cpxh")
+//    @JSONField(name = "cpxh")
-    private String cpxh;
+//    private String cpxh;
 
-    @JSONField(name = "escsc")
+//    @JSONField(name = "escsc")
-    private String escsc;
+//    private String escsc;
 
 //    @JSONField(name = "cycs")
 //    private String cycs;
 
-    @JSONField(name = "mfdwgrdz")
+//    @JSONField(name = "mfdwgrdz")
-    private String mfdwgrdz;
+//    private String mfdwgrdz;
+
+
 
-    @JSONField(name = "clsbh")
+//    @JSONField(name = "clsbh")
-    private String clsbh;
+//    private String clsbh;
 
-    @JSONField(name = "smfdh")
+//    @JSONField(name = "smfdh")
-    private String smfdh;
+//    private String smfdh;
 
-    @JSONField(name = "escscdz")
+//    @JSONField(name = "escscdz")
-    private String escscdz;
+//    private String escscdz;
 
-    @JSONField(name = "smfdwgrzz")
+//    @JSONField(name = "smfdwgrzz")
-    private String smfdwgrzz;
+//    private String smfdwgrzz;
 
-    @JSONField(name = "smfdwdmsfzh")
+//    @JSONField(name = "smfdwdmsfzh")
-    private String smfdwdmsfzh;
+//    private String smfdwdmsfzh;
-    @JSONField(name = "escscdh")
+//    @JSONField(name = "escscdh")
-    private String escscdh;
+//    private String escscdh;
-    @JSONField(name = "cpzh")
+//    @JSONField(name = "cpzh")
-    private String cpzh;
+//    private String cpzh;
 
-    @JSONField(name = "escsckhyhzh")
+//    @JSONField(name = "escsckhyhzh")
-    private String escsckhyhzh;
+//    private String escsckhyhzh;
 
-    @JSONField(name = "cjhj")
+//    @JSONField(name = "cjhj")
-    private String cjhj;
+//    private String cjhj;
 
     @JSONField(name = "xdpbz")
     private String xdpbz;
 
-    @JSONField(name = "cllx")
+//    @JSONField(name = "cllx")
-    private String cllx;
+//    private String cllx;
 
     @JSONField(name = "qdbz")
     private String qdbz;
@@ -229,17 +234,17 @@ public class GetInvoiceVO {
     @JSONField(name = "cpybz")
     private String cpybz;
 
-    @JSONField(name = "zrdcgsmc")
+//    @JSONField(name = "zrdcgsmc")
-    private String zrdcgsmc;
+//    private String zrdcgsmc;
 
-    @JSONField(name = "escscsbh")
+//    @JSONField(name = "escscsbh")
-    private String escscsbh;
+//    private String escscsbh;
 
-    @JSONField(name = "mfdwdmsfzh")
+//    @JSONField(name = "mfdwdmsfzh")
-    private String mfdwdmsfzh;
+//    private String mfdwdmsfzh;
 
-    @JSONField(name = "mfdh")
+//    @JSONField(name = "mfdh")
-    private String mfdh;
+//    private String mfdh;
 
     // 二手车 end
 
@@ -247,38 +252,38 @@ public class GetInvoiceVO {
     @JSONField(name = "xhfmc")
     private String xhfmc;
 
-    @JSONField(name = "hgzs")
+//    @JSONField(name = "hgzs")
-    private String hgzs;
+//    private String hgzs;
 
-    @JSONField(name = "xcrs")
+//    @JSONField(name = "xcrs")
-    private String xcrs;
+//    private String xcrs;
 
     @JSONField(name = "sl")
     private String sl;
 
-    @JSONField(name = "cd")
+//    @JSONField(name = "cd")
-    private String cd;
+//    private String cd;
 
-    @JSONField(name = "skph")
+//    @JSONField(name = "skph")
-    private String skph;
+//    private String skph;
 
     @JSONField(name = "xhfsbh")
     private String xhfsbh;
 
-    @JSONField(name = "khzh")
+//    @JSONField(name = "khzh")
-    private String khzh;
+//    private String khzh;
 
     @JSONField(name = "jdcbz")
     private String jdcbz;
 
-    @JSONField(name = "zgswjgmc")
+//    @JSONField(name = "zgswjgmc")
-    private String zgswjgmc;
+//    private String zgswjgmc;
 
-    @JSONField(name = "zgswjgdm")
+//    @JSONField(name = "zgswjgdm")
-    private String zgswjgdm;
+//    private String zgswjgdm;
 
-    @JSONField(name = "fdjhm")
+//    @JSONField(name = "fdjhm")
-    private String fdjhm;
+//    private String fdjhm;
 
     // 机动车发票end