LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 22年七月工作

Browse Source 
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
#	jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
This commit is contained in:
lijiarao
2022-08-08 09:48:50 +08:00
parent d53adee4a7 bd63856f3d
commit 305de4cb9b
45 changed files with 1535 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+38
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
+39 -1
View File
@@ -286,6 +286,45 @@ 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;
/**会员缴费金额*/
@ApiModelProperty(value = "会员缴费金额")
private BigDecimal memberPaymentAmount;
@@ -295,5 +334,4 @@ public class TbCertificatePayment implements Serializable {
/**其他缴费金额*/
@ApiModelProperty(value = "其他缴费金额")
private BigDecimal otherPaymentAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+41
View File
@@ -258,6 +258,47 @@ 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;
/**会员缴费金额*/
@ApiModelProperty(value = "会员缴费金额")
private BigDecimal memberPaymentAmount;