add 证书缴费审核时更新

2022-05-09 17:22:04 +08:00
parent d0fd95aaec
commit a6a8bcbe50
4 changed files with 234 additions and 0 deletions
@@ -217,6 +217,13 @@ insert into pay_working_group_subitem_contacts(id,working_group_id,working_group
 insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_three,contacts_temporary_id_three,contacts_temporary_name_three,remarks_three,3,create_by,create_time FROM pay_working_group_subitem where contacts_id_three is not null and contacts_id_three !='');
 -- 20220509 发票信息
 ALTER TABLE `tb_member_project_subitem`
+    ADD COLUMN `header_name`     varchar(100) NULL COMMENT '抬头名称',
+    ADD COLUMN `tax_number`      varchar(100) NULL COMMENT '单位税号',
+    ADD COLUMN `invoice_address` varchar(255) NULL COMMENT '单位地址',
+    ADD COLUMN `invoice_phone`   varchar(255) NULL COMMENT '电话号码',
+    ADD COLUMN `deposit_bank`    varchar(255) NULL COMMENT '开户行',
+    ADD COLUMN `bank_account`    varchar(100) NULL COMMENT '银行账户';
+ALTER TABLE `tb_certificate_payment`
    ADD COLUMN `header_name`     varchar(100) NULL COMMENT '抬头名称',
    ADD COLUMN `tax_number`      varchar(100) NULL COMMENT '单位税号',
    ADD COLUMN `invoice_address` varchar(255) NULL COMMENT '单位地址',
@@ -9,11 +9,13 @@ import javax.servlet.http.HttpServletResponse;
 import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.AuthenticationUtils;
 import com.jero.member.entity.TbCertificatePayment;
 import com.jero.member.service.ITbCertificatePaymentService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.member.vo.CertificatePaymentInfo;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,4 +161,21 @@ public class TbCertificatePaymentController extends JeroController<TbCertificate
        return super.exportXls(request, tbCertificatePayment, TbCertificatePayment.class, "证书缴费表");
    }

+	 @PostMapping(value = "/incomingUpdateCertificate")
+	 public Result<Object> incomingUpdateCertificate(@RequestBody TbCertificatePayment tbCertificatePayment){
+		 CertificatePaymentInfo certificatePaymentInfo = new CertificatePaymentInfo();
+		 certificatePaymentInfo.setId(tbCertificatePayment.getTbPaymentId());
+		 certificatePaymentInfo.setMemberId(tbCertificatePayment.getMemberId());
+		 certificatePaymentInfo.setInvoiceRequirements(tbCertificatePayment.getInvoiceRequirements());
+		 certificatePaymentInfo.setHeaderName(tbCertificatePayment.getHeaderName());
+		 certificatePaymentInfo.setTaxNumber(tbCertificatePayment.getTaxNumber());
+		 certificatePaymentInfo.setInvoiceAddress(tbCertificatePayment.getInvoiceAddress());
+		 certificatePaymentInfo.setInvoicePhone(tbCertificatePayment.getInvoicePhone());
+		 certificatePaymentInfo.setDepositBank(tbCertificatePayment.getDepositBank());
+		 certificatePaymentInfo.setBankAccount(tbCertificatePayment.getBankAccount());
+
+		 AuthenticationUtils.post("/certificatePaymentInfo/incomingUpdateCertificate",null,certificatePaymentInfo);
+		 return Result.OK();
+	 }
+
 }
@@ -260,4 +260,23 @@ public class TbCertificatePayment implements Serializable {
    @ApiModelProperty(value = "项目类型")
    private Integer projectType;

+    /**抬头名称*/
+    @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;
+    /**入会申请表文件id*/
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+
 }
@@ -0,0 +1,189 @@
+package com.jero.member.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 证书缴费信息表
+ * @Author: jeecg-boot
+ * @Date:   2020-12-30
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_certificate_payment_info对象", description="证书缴费信息表")
+public class CertificatePaymentInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**缴费单号*/
+	@Excel(name = "缴费单号", width = 15)
+    @ApiModelProperty(value = "缴费单号")
+    private String billNumber;
+	/**单位全称*/
+	@Excel(name = "单位全称", width = 15)
+    @ApiModelProperty(value = "单位全称")
+    private String companyName;
+	/**缴费类型*/
+	@Excel(name = "缴费类型", width = 15, dicCode = "certificate_payment_type")
+    @ApiModelProperty(value = "缴费类型")
+    private Integer paymentType;
+	/**缴费金额*/
+	@Excel(name = "缴费金额", width = 15)
+    @ApiModelProperty(value = "缴费金额")
+    private BigDecimal paymentAmount;
+	/**缴费时长*/
+	@Excel(name = "缴费时长", width = 15, dicCode = "payment_time")
+    @ApiModelProperty(value = "缴费时长")
+    private Integer paymentTime;
+	/**缴费时间*/
+	@Excel(name = "缴费时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "缴费时间")
+    private Date submissionTime;
+	/**核对时间*/
+	@Excel(name = "核对时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "核对时间")
+    private Date checkTime;
+	/**缴费状态 0待支付 1已支付 2已驳回 3已确认*/
+	@Excel(name = "缴费状态", width = 15, dicCode = "certificate_payment_status")
+    @ApiModelProperty(value = "缴费状态")
+    private Integer paymentStatus;
+	/**缴费方式*/
+	@Excel(name = "缴费方式", width = 15, dicCode = "payment_method")
+    @ApiModelProperty(value = "缴费方式")
+    private Integer paymentMethod;
+	/**缴费记录*/
+    @ApiModelProperty(value = "缴费记录")
+    private String paymentRecord;
+	/**会员id*/
+    @ApiModelProperty(value = "会员id")
+    private String memberId;
+	/**审核结果*/
+	@Excel(name = "审核结果", width = 15, dicCode = "check_result")
+    @ApiModelProperty(value = "审核结果")
+    private Integer checkResult;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String checkMark;
+    /**缴费备注*/
+    @Excel(name = "缴费备注", width = 15)
+    @ApiModelProperty(value = "缴费备注")
+    private String paymentMark;
+    /**是否绑定vin证书*/
+    @Excel(name = "是否绑定vin证书", width = 15)
+    @ApiModelProperty(value = "是否绑定vin证书")
+    private Integer bind;
+
+    /**通讯地址*/
+    @Excel(name = "通讯地址", width = 15)
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
+    /**邮编*/
+    @Excel(name = "邮编", width = 15)
+    @ApiModelProperty(value = "邮编")
+    private String postcode;
+
+    @ApiModelProperty(value = "证书")
+    @TableField(exist = false)
+    private List<Map<String,Object>> certificate;
+
+    /**证书id*/
+    @ApiModelProperty(value = "证书id")
+    private String certificateId;
+
+    /**审核人*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "审核人")
+    private String checkMember;
+    /**审核人id*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "审核人id")
+    private String checkMemberId;
+
+    /**抬头名称*/
+    @Excel(name = "抬头名称", width = 15)
+    @ApiModelProperty(value = "抬头名称")
+    private String headerName;
+    /**单位税号*/
+    @Excel(name = "单位税号", width = 15)
+    @ApiModelProperty(value = "单位税号")
+    private String taxNumber;
+    /**发票*/
+    @Excel(name = "发票", width = 15, dicCode = "invoice_requirements")
+    @ApiModelProperty(value = "发票")
+    private Integer invoiceRequirements;
+    /**网员服务费*/
+    @Excel(name = "网员服务费", width = 15)
+    @ApiModelProperty(value = "网员服务费")
+    private BigDecimal serviceCharge;
+
+    /**
+     * 单位地址
+     */
+    @ApiModelProperty(value = "单位地址")
+    private String  invoiceAddress;
+    /**
+     * 电话号码
+     */
+    @ApiModelProperty(value = "电话号码")
+    private String invoicePhone;
+    /**
+     * 开户行
+     */
+    @ApiModelProperty(value = "开户行")
+    private String depositBank;
+    /**
+     * 银行账户
+     */
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+
+    /**
+     * 证书识别代码
+     */
+    @ApiModelProperty(value = "证书识别代码")
+    private String code;
+
+}