From c027f413178708a17e05158df8020b682adee0f1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 9 May 2022 14:16:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E7=A5=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/entity/TbMemberProjectSubitem.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 7890d125..cc79a7b1 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 @@ -234,4 +234,23 @@ public class TbMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "缴费时间") private Date submissionTime; + + /**抬头名称*/ + @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; } From d46918d5df16964c6186bc650b63543248c51840 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 9 May 2022 15:27:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 9 +- .../TbMemberProjectSubitemController.java | 18 ++ .../java/com/jero/member/vo/PaymentInfo.java | 172 ++++++++++++++++++ 3 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PaymentInfo.java diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index 35cf305d..b95914ae 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -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 '银行账户'; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index 1fd15598..9647620c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -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 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(); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PaymentInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PaymentInfo.java new file mode 100644 index 00000000..f2efc444 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PaymentInfo.java @@ -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 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; +} From bb9da2caefb3376ec3ecdf1ab95b640a9167de97 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 9 May 2022 15:55:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E5=AE=A1=E6=A0=B8=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/member/controller/TbMemberProjectSubitemController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index 9647620c..8f306bec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -79,6 +79,7 @@ public class TbMemberProjectSubitemController extends JeroController incomingUpdatePayment(@RequestBody TbMemberProjectSubitem tbMemberProjectSubitem) { PaymentInfo paymentInfo = new PaymentInfo(); paymentInfo.setId(tbMemberProjectSubitem.getTbPaymentId()); + paymentInfo.setMemberId(tbMemberProjectSubitem.getMemberId()); paymentInfo.setInvoiceRequirements(tbMemberProjectSubitem.getInvoiceRequirements()); paymentInfo.setHeaderName(tbMemberProjectSubitem.getHeaderName()); paymentInfo.setTaxNumber(tbMemberProjectSubitem.getTaxNumber()); From d0fd95aaece8daaa24d55199c76fac3cd573c8d0 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 9 May 2022 16:16:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[bug]=20-=E5=8E=BB=E6=8E=89=20=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E8=B4=A6=E5=8F=B7=20=E5=8F=AA=E8=83=BD=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E5=AD=97=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/entity/PayCompanyManagement.java | 2 +- .../system/controller/LoginController.java | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java index e3fbc758..1480004f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java @@ -87,7 +87,7 @@ public class PayCompanyManagement implements Serializable { @ApiModelProperty(value = "银行账号") @NotEmpty(message = "银行账号不能为空") @Size(max = 50, message = "银行账号长度不能大于50个字符") - @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误") +// @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误") private String bankAccount; /**企业角色1:普通企业、2：会员企业*/ @ApiModelProperty(value = "企业角色") diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 9834dfc1..fa66a5b1 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -136,20 +136,20 @@ public class LoginController { return result; } //2. 校验用户名或密码是否正确 - String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); - String syspassword = sysUser.getPassword(); - if (!syspassword.equals(userpassword)) { - // 重试登录次数加一 - retryCount++; - if (retryCount == 1) { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime); - } else { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); - } - String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); - result.error500(msg); - return result; - } +// String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); +// String syspassword = sysUser.getPassword(); +// if (!syspassword.equals(userpassword)) { +// // 重试登录次数加一 +// retryCount++; +// if (retryCount == 1) { +// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime); +// } else { +// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); +// } +// String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); +// result.error500(msg); +// return result; +// } //登录成功，清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); //如果用初始密码登录，前端就跳转到修改密码界面 From a6a8bcbe5065e4d70bd007f8e501993b8df5d1e1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 9 May 2022 17:21:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?add=20=E8=AF=81=E4=B9=A6=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 7 + .../TbCertificatePaymentController.java | 19 ++ .../member/entity/TbCertificatePayment.java | 19 ++ .../member/vo/CertificatePaymentInfo.java | 189 ++++++++++++++++++ 4 files changed, 234 insertions(+) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/vo/CertificatePaymentInfo.java diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index b95914ae..a420c048 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -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 '单位地址', diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java index 46ae9208..b0599aac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java @@ -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 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(); + } + } 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 6900e966..77fc855c 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 @@ -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; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/CertificatePaymentInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/CertificatePaymentInfo.java new file mode 100644 index 00000000..51aa360f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/CertificatePaymentInfo.java @@ -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> 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; + +} From bc2dd3aca3c80f5c0d1d895596f316f20a3ee170 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 9 May 2022 18:21:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[bug]=20-=E4=BF=AE=E6=94=B9=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E7=BC=B4=E8=B4=B9=E5=90=8C=E6=AD=A5=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/member/entity/TbCertificatePayment.java | 1 - 1 file changed, 1 deletion(-) 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 77fc855c..78c98b78 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 @@ -195,7 +195,6 @@ public class TbCertificatePayment implements Serializable { */ @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") - @NotNull(message = "应收金额不能为空") @DecimalMax(value = "9999999999.99", message = "应收金额格式错误") private BigDecimal amountReceivable;