销项合并：蓝字发票开具DTO对应

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jianshui.common.annotation.Excel;
 import com.jianshui.common.core.domain.BaseEntity;
+import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddtdywxxDTO;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -244,6 +246,82 @@ public class BillInfo extends BaseEntity
     /** ext金财数科字段 */
     private String ext;
 
+    /** 全电新增字段  **/
+    private String async;
+
+    @ApiModelProperty(value = "办税人身份证号")
+    private String bsrysfzjhm;
+
+    @ApiModelProperty(value = "*地区编码(参考码表)")
+    private String dqbm;
+
+    @ApiModelProperty(value = "lzfpkj")
+    private String serviceId;
+
+    @ApiModelProperty(value = "放弃享受减按1%征收率原因")
+    private String kjlx;
+
+    @ApiModelProperty(value = "出行人")
+    private String cxr;
+
+    @ApiModelProperty(value = "出行人证件类型")
+    private String cxrzjlx;
+
+    @ApiModelProperty(value = "出行人证件号码")
+    private String cxrzjhm;
+
+    @ApiModelProperty(value = "出行日期")
+    private String cxrq;
+
+    @ApiModelProperty(value = "出发地")
+    private String cfd;
+
+    @ApiModelProperty(value = "到达地")
+    private String ddd;
+
+    @ApiModelProperty(value = "交通工具类型")
+    private String jtgjlx;
+
+    @ApiModelProperty(value = "等级")
+    private String dengj;
+
+    @ApiModelProperty(value = "货物运输服务")
+    private String hwysfw;
+
+    @ApiModelProperty(value = "起运地")
+    private String qyd;
+
+    @ApiModelProperty(value = "运输工具号牌")
+    private String ysgjhp;
+
+    @ApiModelProperty(value = "运输工具种类")
+    private String ysgjzl;
+
+    @ApiModelProperty(value = "运输货物名称")
+    private String yshwmc;
+
+    @ApiModelProperty(value = "含税标志 1-不含税 2-含税")
+    private String hsbz;
+
+    @ApiModelProperty(value = "放弃享受减按1%征收率原因")
+    private String kjly;
+
+    @ApiModelProperty(value = "附加信息名称")
+    private String fjxxmc;
+
+    @ApiModelProperty(value = "附加信息内容")
+    private String fjxxnr;
+
+
+
+
+
+
+
+
+
+
+
 
     @Override
     public String getSearchValue() {

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java

@@ -2,8 +2,10 @@ package com.jianshui.invoice.domain.dto.adapter.request.aisino_jn;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.jianshui.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -193,4 +195,21 @@ public class HxBillDetailDTO implements Serializable {
     //折扣
     @JSONField(name = "discount")
     private String discount;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java

@@ -4,8 +4,11 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jianshui.common.annotation.Excel;
 import com.jianshui.invoice.domain.BillInfo;
+import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddtdywxxDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -346,4 +349,117 @@ public class HxBillInfoDTO extends BillInfo {
     // @Transient
     // private transient String invoiceState; // 发票开票状态。数据库里没有这个字段
 
+
+
+    /** 全电新增字段  **/
+    @JSONField(name = "async")
+    private String async;
+
+    @ApiModelProperty(value = "办税人身份证号")
+    @JSONField(name = "bsrysfzjhm")
+    private String bsrysfzjhm;
+
+    @ApiModelProperty(value = "*地区编码(参考码表)")
+    @JSONField(name = "dqbm")
+    private String dqbm;
+
+    @JSONField(name = "serviceId")
+    @ApiModelProperty(value = "lzfpkj")
+    private String serviceId;
+
+    @JSONField(name = "kjlx")
+    @ApiModelProperty(value = "放弃享受减按1%征收率原因")
+    private String kjlx;
+
+    @JSONField(name = "cxr")
+    @ApiModelProperty(value = "出行人")
+    private String cxr;
+
+    @JSONField(name = "cxrzjlx")
+    @ApiModelProperty(value = "出行人证件类型")
+    private String cxrzjlx;
+
+    @JSONField(name = "cxrzjhm")
+    @ApiModelProperty(value = "出行人证件号码")
+    private String cxrzjhm;
+
+    @JSONField(name = "cxrq")
+    @ApiModelProperty(value = "出行日期")
+    private String cxrq;
+
+    @JSONField(name = "cfd")
+    @ApiModelProperty(value = "出发地")
+    private String cfd;
+
+    @JSONField(name = "ddd")
+    @ApiModelProperty(value = "到达地")
+    private String ddd;
+
+    @JSONField(name = "jtgjlx")
+    @ApiModelProperty(value = "交通工具类型")
+    private String jtgjlx;
+
+    @JSONField(name = "dengj")
+    @ApiModelProperty(value = "等级")
+    private String dengj;
+
+    @JSONField(name = "hwysfw")
+    @ApiModelProperty(value = "货物运输服务")
+    private String hwysfw;
+
+    @JSONField(name = "qyd")
+    @ApiModelProperty(value = "起运地")
+    private String qyd;
+
+    @JSONField(name = "ysgjhp")
+    @ApiModelProperty(value = "运输工具号牌")
+    private String ysgjhp;
+
+    @JSONField(name = "ysgjzl")
+    @ApiModelProperty(value = "运输工具种类")
+    private String ysgjzl;
+
+    @JSONField(name = "yshwmc")
+    @ApiModelProperty(value = "运输货物名称")
+    private String yshwmc;
+
+
+    // TODO: 2023/3/27  
+    @ApiModelProperty(value = "购方信息确认")
+    private String gfxxconfirm;
+
+    @ApiModelProperty(value = "含税标志 1-不含税 2-含税")
+    private String hsbz;
+
+    @ApiModelProperty(value = "特定类型代码")
+    private String tdyslxdm;
+
+
+    @ApiModelProperty(value = "附加信息名称")
+    private String fjxxmc;
+
+    @ApiModelProperty(value = "附加信息内容")
+    private String fjxxnr;
+
+    @ApiModelProperty(value = "不动产")
+    List<InvoiceAllAddtdywxxDTO> tdywxx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/CxhzJsonDataDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionDetailDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileAcquisitionOnDetailDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/KshcDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/QueryDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/ShhzJsonDataDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/SqhzJsonDataDetailDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/YhdjDetailDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk;
+package com.jianshui.invoice.domain.dto.api.jcsk;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddDTO.java

@@ -1,5 +1,6 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
+import cn.hutool.core.annotation.Alias;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,9 +14,6 @@ import javax.validation.constraints.NotEmpty;
 @Data
 public class InvoiceAllAddDTO {
 
-    @ApiModelProperty(value = "渠道标识")
-    private String appkey;
-
     @NotEmpty
     @ApiModelProperty(value = "true")
     private String async;
@@ -29,7 +27,8 @@ public class InvoiceAllAddDTO {
     private String dqbm;
 
     @NotEmpty
-    @ApiModelProperty(value = "*纳税人识别号")
+    @ApiModelProperty(value = "纳税人识别号=销方企业税号")
+    @Alias("saletaxnum")
     private String nsrsbh;
 
     @NotEmpty

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddInfoDTO.java

@@ -1,5 +1,6 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
+import cn.hutool.core.annotation.Alias;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,13 +15,18 @@ import java.util.List;
 @Data
 public class InvoiceAllAddInfoDTO {
 
+    /** message*/
+    @Alias("message")
     @ApiModelProperty(value = "备注")
     private String bz;
 
+    /** invoiceline*/
+    @Alias("invoiceType")
     @NotEmpty
     @ApiModelProperty(value = "发票类型代码")
     private String fplxdm;
 
+    /** fpqqlsh*/
     @NotEmpty
     @ApiModelProperty(value = "发票请求流水号")
     private String fpqqlsh;
@@ -28,26 +34,39 @@ public class InvoiceAllAddInfoDTO {
     @ApiModelProperty(value = "购方信息确认")
     private String gfxxconfirm;
 
+    /** address*/
+    @Alias("buyerAddress")
     @NotEmpty
     @ApiModelProperty(value = "购买方地址")
     private String gmfdz;
 
+    /** buyerBank*/
+    @Alias("buyerBank")
     @NotEmpty
     @ApiModelProperty(value = "购买方开户行")
     private String gmfkhh;
 
+
+    /** phone*/
+    @Alias("buyerPhone")
     @NotEmpty
     @ApiModelProperty(value = "购买方联系电话")
     private String gmflxdh;
 
+    /** buyerName*/
+    @Alias("buyerName")
     @NotEmpty
     @ApiModelProperty(value = "购买方名称")
     private String gmfmc;
 
+    /** taxnum*/
+    @Alias("buyerTaxnum")
     @NotEmpty
     @ApiModelProperty(value = "购买方税号")
     private String gmfnsrsbh;
 
+    /** fpqqlsh*/
+    @Alias("buyerAccount")
     @NotEmpty
     @ApiModelProperty(value = "购买方银行账号")
     private String gmfyhzh;
@@ -60,6 +79,7 @@ public class InvoiceAllAddInfoDTO {
     @ApiModelProperty(value = "合计税额")
     private String hjse;
 
+    /** hsbz*/
     @NotEmpty
     @ApiModelProperty(value = "含税标志 1-不含税 2-含税")
     private String hsbz;
@@ -84,7 +104,7 @@ public class InvoiceAllAddInfoDTO {
     @ApiModelProperty(value = "价税合计")
     private String jshj;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "放弃享受减按1%征收率原因")
     private String kjly;
 
 //    特定业务必填
@@ -92,26 +112,38 @@ public class InvoiceAllAddInfoDTO {
     @ApiModelProperty(value = "特定要素类型代码")
     private String tdyslxdm;
 
+    /** saleaddress*/
+    @Alias("sellerAddress")
     @NotEmpty
     @ApiModelProperty(value = "销方地址")
     private String xsfdz;
 
+    /** sellerBank*/
+    @Alias("sellerBank")
     @NotEmpty
     @ApiModelProperty(value = "销方开户行")
     private String xsfkhh;
 
+    /** salephone*/
+    @Alias("sellerTelephone")
     @NotEmpty
     @ApiModelProperty(value = "销方联系电话")
     private String xsflxdh;
 
+    /** fpqqlsh*/
+    @Alias("sellerName")
     @NotEmpty
     @ApiModelProperty(value = "销方名称")
     private String xsfmc;
 
+    /** saletaxnum*/
+    @Alias("sellerTaxnum")
     @NotEmpty
     @ApiModelProperty(value = "销方税号")
     private String xsfnsrsbh;
 
+    /** saleaccount*/
+    @Alias("sellerAccount")
     @NotEmpty
     @ApiModelProperty(value = "销方银行账号")
     private String xsfyhzh;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddextDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddfjxxListDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddmxListDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
 import lombok.Data;
 

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxbdcjyzlfwDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/add/InvoiceAllAddtdywxxjzfwDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.add;
+package com.jianshui.invoice.domain.dto.api.jcsk.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/red/AddRedInvoiceDTO.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.jcsk.red;
+package com.jianshui.invoice.domain.dto.api.jcsk.red;
 
 import lombok.Data;