From 6ce83da94396e4f67416d318a95c1b1cd509df0b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Aug 2022 10:50:45 +0800 Subject: [PATCH] =?UTF-8?q?udpate=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E7=A8=8E=E9=A2=9D=EF=BC=8C=E6=9C=AA=E7=A8=8E=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 28 ++++++------- .../jero/mail/entity/PayMailBillProject.java | 14 +++++++ .../meeting/entity/PayMeetingSituation.java | 40 +++++++++++++++++++ .../entity/PayMemberProjectSubitem.java | 38 ++++++++++++++++++ .../member/entity/TbCertificatePayment.java | 38 ++++++++++++++++++ .../member/entity/TbMemberProjectSubitem.java | 40 +++++++++++++++++++ .../entity/PayConfirmPaymentRecord.java | 18 +++++++-- .../jero/payment/entity/PayPaymentRecord.java | 12 ++++++ .../jero/project/entity/PayCommonProject.java | 39 ++++++++++++++++++ .../entity/PayWorkingGroupSubItem.java | 39 ++++++++++++++++++ 10 files changed, 288 insertions(+), 18 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 1a2b01ad..3f567a51 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -240,7 +240,7 @@ alter table tb_certificate_payment alter table pay_payment_record add column tax decimal(12, 2) default 0 comment '税额', add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; -alter table pay_mail_bill +alter table pay_mail_bill_project add column tax decimal(12, 2) default 0 comment '税额', add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; alter table pay_confirm_payment_record @@ -250,50 +250,50 @@ alter table pay_confirm_payment_record alter table pay_common_project add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', + add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table pay_working_group_subitem add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', + add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table pay_member_project_subitem add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', + add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table pay_meeting_situation add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', + add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table tb_member_project_subitem add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', + add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table tb_certificate_payment add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', + add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; -- 处理历史数据 update pay_payment_record @@ -301,7 +301,7 @@ set no_tax_amount = amount_received / 1.06, tax = amount_received - no_tax_amount where amount_received is not null; -update pay_mail_bill +update pay_mail_bill_project set no_tax_amount = invoice_amount / 1.06, tax = invoice_amount - no_tax_amount where invoice_amount is not null; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java index 4bdfe35e..d42a8461 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java @@ -52,6 +52,20 @@ public class PayMailBillProject implements Serializable { @DecimalMax(value = "9999999999.99",message = "开票金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal invoiceAmount; + /**税额*/ + @Excel(name = "税额", width = 15) + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; + /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 3220aec9..af13b989 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -460,4 +460,44 @@ public class PayMeetingSituation implements Serializable { @TableField(exist = false) @Dict(dicCode = "sign_up_status") private Integer signUpStatus; + + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 55a38be3..2a093de7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -297,4 +297,42 @@ public class PayMemberProjectSubitem implements Serializable { @TableField(exist = false) private String email; + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java index 79263095..69b505b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java @@ -286,4 +286,42 @@ public class TbCertificatePayment implements Serializable { @ApiModelProperty(value = "银行账户") private String bankAccount; + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index f3028ea7..00e32aa0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -258,4 +258,44 @@ public class TbMemberProjectSubitem implements Serializable { /**入会申请表文件id*/ @ApiModelProperty(value = "银行账户") private String bankAccount; + + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java index a4c77d25..b8ca6607 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java @@ -18,13 +18,10 @@ import javax.validation.constraints.DecimalMax; import javax.validation.constraints.NotNull; /** - * + *确认来款记录表 *@author liJiaRao *@date 2022-06-08 17:22 */ -/** - * 确认来款记录表 - */ @ApiModel(value="确认来款记录表") @Data @TableName(value = "pay_confirm_payment_record") @@ -108,6 +105,19 @@ public class PayConfirmPaymentRecord implements Serializable { @ApiModelProperty(value="备注") private String remark; + + /**税额*/ + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; + public static final String COL_ID = "id"; public static final String COL_CREATE_BY = "create_by"; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index b7052918..5edaaf03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -115,4 +115,16 @@ public class PayPaymentRecord implements Serializable { @Dict(dicCode = "meeting_pay_type") @TableField(exist = false) private Integer paymentMethod; + + /**税额*/ + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 61fcb93b..eab079c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -262,4 +262,43 @@ public class PayCommonProject implements Serializable { @TableField(exist = false) private String endAmount; + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 133133d4..eaada7b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -399,4 +399,43 @@ public class PayWorkingGroupSubItem implements Serializable { @Size(max = 50,message = "联系人10备注长度不能大于50个字符") @TableField(exist = false) private String remarksTen; + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; }