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

add 标协会员项目 管理员创建标识判断

Browse Source
This commit is contained in:
lijiarao
2022-12-08 11:35:42 +08:00
parent 707748cb79
commit 82c0b807d4
4 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/22年12月变更.sql
+5 -1
View File
@@ -3,4 +3,8 @@ ALTER TABLE `tb_certificate_payment`
ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id';
ALTER TABLE `tb_member_project_subitem`
ADD COLUMN `post_company_id` varchar(100) NULL COMMENT '邮寄企业id',
ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id';
ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id';
ALTER TABLE `tb_certificate_payment`
ADD COLUMN `admin_add_flag` tinyint(1) default 0 COMMENT '管理员创建标识';
ALTER TABLE `tb_member_project_subitem`
ADD COLUMN `admin_add_flag` tinyint(1) default 0 COMMENT '管理员创建标识';
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
+5
View File
@@ -360,4 +360,9 @@ public class TbCertificatePayment implements Serializable {
@ApiModelProperty(value = "邮寄联系人id")
private String postContactId;
/**
* 管理员创建标识
*/
@ApiModelProperty(value = "管理员创建标识")
private Integer adminAddFlag;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+5
View File
@@ -333,4 +333,9 @@ public class TbMemberProjectSubitem implements Serializable {
@ApiModelProperty(value = "邮寄联系人id")
private String postContactId;
/**
* 管理员创建标识
*/
@ApiModelProperty(value = "管理员创建标识")
private Integer adminAddFlag;
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+46 -36
View File
@@ -653,7 +653,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
tbMember.setConfirmTax(tax);
tbMember.setConfirmNoTaxAmount(noTaxAmount);
}else {
tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
if (tbMember.getAdminAddFlag() == 1) {
tbMember.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
}else {
tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
}
}
tbMemberProjectSubitemMapper.updateById(tbMember);
return Result.OK("添加成功！");
@@ -683,44 +687,50 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
certificatePayment.setInAccount(inAccount);
certificatePayment.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
//税额
BigDecimal noTaxAmount;
BigDecimal tax;
//税额赋值
BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
if (certificatePayment.getInvoiceRequirements() == 0) {
noTaxAmount = amountReceived;
tax = BigDecimal.ZERO;
}else {
noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
tax = amountReceived.subtract(noTaxAmount);
}
//保存税额
certificatePayment.setConfirmTax(tax);
certificatePayment.setConfirmNoTaxAmount(noTaxAmount);
//插入来款记录表
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (sysUser!=null) {
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
}else {
payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
payPaymentRecord.setReviewerName("标协管理员");
}
payPaymentRecord.setReviewTime(new Date());
payPaymentRecord.setProjectId(certificatePayment.getId());
payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE6));
payPaymentRecord.setTax(tax);
payPaymentRecord.setNoTaxAmount(noTaxAmount);
payPaymentRecordMapper.insert(payPaymentRecord);
}else {
certificatePayment.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
if (certificatePayment.getAdminAddFlag() == 1) {
certificatePayment.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
}else {
certificatePayment.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
}
}
//税额
BigDecimal noTaxAmount;
BigDecimal tax;
//税额赋值
BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
if (certificatePayment.getInvoiceRequirements() == 0) {
noTaxAmount = amountReceived;
tax = BigDecimal.ZERO;
}else {
noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
tax = amountReceived.subtract(noTaxAmount);
}
//保存税额
certificatePayment.setConfirmTax(tax);
certificatePayment.setConfirmNoTaxAmount(noTaxAmount);
certificatePaymentMapper.updateById(certificatePayment);
//插入来款记录表
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if (sysUser!=null) {
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
}else {
payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
payPaymentRecord.setReviewerName("标协管理员");
}
payPaymentRecord.setReviewTime(new Date());
payPaymentRecord.setProjectId(certificatePayment.getId());
payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE6));
payPaymentRecord.setTax(tax);
payPaymentRecord.setNoTaxAmount(noTaxAmount);
payPaymentRecordMapper.insert(payPaymentRecord);
return Result.OK("添加成功！");
}