fix 来款编辑缴费发票信息

db/22年7月变更.sql

@@ -117,3 +117,10 @@ INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `descri
 INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1559726741769768961', '1559726337589858306', '确认', '1', '', 2.00, 1, 'LKGLZ', '2022-08-17 10:20:08', 'LKGLZ', '2022-08-17 10:20:14');
 INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1559726694147641345', '1559726337589858306', '未确认', '0', '', 1.00, 1, 'LKGLZ', '2022-08-17 10:19:57', NULL, NULL);
 
+-- 处理历史数据金额数据
+update tb_certificate_payment
+set certificate_payment_amount = amount_receivable
+where certificate_payment_amount is null;
+update tb_member_project_subitem
+set member_payment_amount = amount_receivable
+where member_payment_amount is null;

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java

@@ -282,7 +282,7 @@ public class TbCertificatePayment implements Serializable {
     /**开户银行*/
     @ApiModelProperty(value = "开户银行")
     private String depositBank;
-    /**入会申请表文件id*/
+    /**银行账户*/
     @ApiModelProperty(value = "银行账户")
     private String bankAccount;
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java

@@ -127,4 +127,37 @@ public class PayPaymentRecord implements Serializable {
     @DecimalMax(value = "9999999999.99",message = "未税金额")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal noTaxAmount;
+
+    /**发票*/
+    @ApiModelProperty(value = "发票")
+    @TableField(exist = false)
+    private Integer invoiceRequirements;
+    /**抬头名称*/
+    @ApiModelProperty(value = "抬头名称")
+    @TableField(exist = false)
+    private String headerName;
+    /**单位税号*/
+    @ApiModelProperty(value = "单位税号")
+    @TableField(exist = false)
+    private String taxNumber;
+    /**发票地址*/
+    @ApiModelProperty(value = "发票地址")
+    @TableField(exist = false)
+    private String invoiceAddress;
+    /**发票电话*/
+    @ApiModelProperty(value = "发票电话")
+    @TableField(exist = false)
+    private String invoicePhone;
+    /**开户银行*/
+    @ApiModelProperty(value = "开户银行")
+    @TableField(exist = false)
+    private String depositBank;
+    /**银行账户*/
+    @ApiModelProperty(value = "银行账户")
+    @TableField(exist = false)
+    private String bankAccount;
+    /**联行号*/
+    @ApiModelProperty(value = "联行号")
+    @TableField(exist = false)
+    private String linkBankNumber;
 }

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java

@@ -610,6 +610,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
                 //拼装推到标协缴费的参数
                 List<TbCheckVo> typr5List = new ArrayList<>();
+                BeanUtils.copyProperties(payPaymentRecord,tbCheckVo);
                 tbCheckVo.setId(tbMember.getTbPaymentId());
                 tbCheckVo.setCheckMark(payPaymentRecord.getReviewInstructions());
                 typr5List.add(tbCheckVo);
@@ -688,6 +689,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
                 //拼装推到标协缴费的参数
                 List<TbCheckVo> typr6List = new ArrayList<>();
+                BeanUtils.copyProperties(payPaymentRecord,tbCheckCerVo);
                 tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
                 tbCheckCerVo.setCheckMark(payPaymentRecord.getReviewInstructions());
                 typr6List.add(tbCheckCerVo);

jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java

@@ -1,5 +1,7 @@
 package com.jero.payment.vo;
 
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -20,4 +22,30 @@ public class TbCheckVo {
      *  备注
      */
     private String checkMark;
+
+
+    /**发票*/
+    @ApiModelProperty(value = "发票")
+    private Integer invoiceRequirements;
+    /**抬头名称*/
+    @ApiModelProperty(value = "抬头名称")
+    private String headerName;
+    /**单位税号*/
+    @ApiModelProperty(value = "单位税号")
+    private String taxNumber;
+    /**发票地址*/
+    @ApiModelProperty(value = "发票地址")
+    private String invoiceAddress;
+    /**发票电话*/
+    @ApiModelProperty(value = "发票电话")
+    private String invoicePhone;
+    /**开户银行*/
+    @ApiModelProperty(value = "开户银行")
+    private String depositBank;
+    /**银行账户*/
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+    /**联行号*/
+    @ApiModelProperty(value = "联行号")
+    private String linkBankNumber;
 }