add 会员缴费审核时更新

2022-05-09 15:27:17 +08:00
parent c027f41317
commit d46918d5df
3 changed files with 198 additions and 1 deletions
@@ -215,4 +215,11 @@ CREATE TABLE `pay_working_group_subitem_contacts`  (
 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_one,contacts_temporary_id_one,contacts_temporary_name_one,remarks_one,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_one is not null and contacts_id_one !='');
 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_two,contacts_temporary_id_two,contacts_temporary_name_two,remarks_two,2,create_by,create_time FROM pay_working_group_subitem where contacts_id_two is not null and contacts_id_two !='');
 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 '银行账户';
@@ -9,12 +9,14 @@ 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.common.util.PasswordUtil;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.ITbMemberProjectSubitemService;
 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.PaymentInfo;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -73,4 +75,20 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
        return super.exportListXls(pageList.getRecords(), TbMemberProjectSubitem.class, "标协会员项目成员表");
    }

+	 @PostMapping(value = "/incomingUpdatePayment")
+	 public Result<Object> incomingUpdatePayment(@RequestBody TbMemberProjectSubitem tbMemberProjectSubitem) {
+		 PaymentInfo paymentInfo = new PaymentInfo();
+		 paymentInfo.setId(tbMemberProjectSubitem.getTbPaymentId());
+		 paymentInfo.setInvoiceRequirements(tbMemberProjectSubitem.getInvoiceRequirements());
+		 paymentInfo.setHeaderName(tbMemberProjectSubitem.getHeaderName());
+		 paymentInfo.setTaxNumber(tbMemberProjectSubitem.getTaxNumber());
+		 paymentInfo.setDepositBank(tbMemberProjectSubitem.getDepositBank());
+		 paymentInfo.setBankAccount(tbMemberProjectSubitem.getBankAccount());
+		 paymentInfo.setInvoiceAddress(tbMemberProjectSubitem.getInvoiceAddress());
+		 paymentInfo.setInvoicePhone(tbMemberProjectSubitem.getInvoicePhone());
+
+		 AuthenticationUtils.post("/paymentInfo/incomingUpdatePayment",null,paymentInfo);
+		 return Result.OK();
+	 }
+
 }
@@ -0,0 +1,172 @@
+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.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author liJiaRao
+ * @date 2022-05-09 15:18
+ */
+@Data
+public class PaymentInfo {
+    private static final long serialVersionUID = 1L;
+
+    @TableField(exist = false)
+    @Excel(name = "序号", width = 5)
+    private Integer num;
+    /**主键*/
+    @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 = "payment_type")
+    @Dict(dicCode = "payment_type")
+    @ApiModelProperty(value = "缴费类型")
+    private Integer paymentType;
+    /** 生效日期 */
+    @Excel(name = "生效日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "生效日期")
+    private Date effectiveDate;
+    /** 失效日期 */
+    @Excel(name = "失效日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "失效日期")
+    private Date invalidationDate;
+    /**缴费时长*/
+    @Excel(name = "缴费时长", width = 15, dicCode = "payment_time")
+    @ApiModelProperty(value = "缴费时长")
+    private Integer paymentTime;
+    /**缴费金额*/
+    @Excel(name = "缴费金额", width = 15)
+    @ApiModelProperty(value = "缴费金额")
+    private BigDecimal paymentAmount;
+    /**是否绑定vin证书*/
+    @Excel(name = "绑定证书", width = 15,dicCode = "bind_certificate")
+    @Dict(dicCode = "bind_certificate")
+    private Integer bind;
+    /**网员服务费*/
+    @ApiModelProperty(value = "网员服务费")
+    private BigDecimal serviceCharge;
+    /**证书个数*/
+    @ApiModelProperty(value = "证书个数")
+    private Integer certificatesNum;
+    /**缴费时间*/
+    @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;
+    /**缴费状态*/
+    @Excel(name = "缴费状态", width = 15, dicCode = "payment_status")
+    @ApiModelProperty(value = "缴费状态")
+    private Integer paymentStatus;
+    /**缴费方式*/
+//	@Excel(name = "缴费方式", width = 15, dicCode = "payment_method")
+    @Dict(dicCode = "payment_method")
+    @ApiModelProperty(value = "缴费方式")
+    private Integer paymentMethod;
+    /**缴费记录*/
+    @ApiModelProperty(value = "缴费记录")
+    private String paymentRecord;
+    /**发票*/
+//	@Excel(name = "发票", width = 15, dicCode = "invoice_requirements")
+    @Dict(dicCode = "invoice_type")
+    @ApiModelProperty(value = "发票")
+    private Integer invoiceRequirements;
+    /**抬头名称*/
+    @ApiModelProperty(value = "抬头名称")
+    private String headerName;
+    /**单位税号*/
+    @ApiModelProperty(value = "单位税号")
+    private String taxNumber;
+    /**会员id*/
+    @ApiModelProperty(value = "会员id")
+    private String memberId;
+
+    /**通讯地址*/
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
+    /**邮编*/
+    @ApiModelProperty(value = "邮编")
+    private String postcode;
+    //
+    //@ApiModelProperty(value = "证书")
+    //@TableField(exist = false)
+    //private List<VinCertificate> certificate;
+
+    /**审核结果*/
+    @ApiModelProperty(value = "审核结果")
+//    @Excel(name = "审核结果", width = 15, dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private java.lang.Integer checkResult;
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    private java.lang.String checkMark;
+    /**审核人*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "审核人")
+    private java.lang.String checkMember;
+    /**审核人id*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "审核人id")
+    private java.lang.String checkMemberId;
+    /**缴费备注*/
+    @ApiModelProperty(value = "缴费备注")
+    private java.lang.String remark;
+    /**开户银行*/
+    @ApiModelProperty(value = "开户银行")
+    private String depositBank;
+    /**银行账户*/
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+    /**发票地址*/
+    @ApiModelProperty(value = "发票地址")
+    private String invoiceAddress;
+    /**发票电话*/
+    @ApiModelProperty(value = "发票电话")
+    private String invoicePhone;
+}