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

add 标协会员来款时生成有效期

Browse Source 
update 标协会员来款撤销
This commit is contained in:
lijiarao
2024-03-27 18:00:16 +08:00
parent f85fb38024
commit 1822a0962b
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+36 -8
View File
@@ -38,6 +38,7 @@ import com.jero.member.mapper.TbCertificatePaymentMapper;
import com.jero.member.mapper.TbMemberProjectSubitemMapper;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.ITbMemberProjectService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.entity.PayPackCompany;
@@ -109,6 +110,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
@Resource
private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
@Resource
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
@@ -532,13 +535,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
tbMember.setPaymentStatus(paymentStatus);
tbMemberProjectSubitemMapper.updateById(tbMember);
//拼装推到标协缴费的参数
// TbCheckVo tbCheckVo = new TbCheckVo();
// tbCheckVo.setId(tbMember.getTbPaymentId());
// tbCheckVo.setCheckResult(PayProjectCommon.YES);
//// tbCheckVo.setCheckMark(payPaymentRecord.getRemark());
// typr5List.add(tbCheckVo);
// 生成会员有效期
String id = payPaymentRecord.getProjectId();
tbMemberProjectSubitemService.generateValidDate(id);
break;
//标协证书
case PayIncomeContractCommon.PROJECT_TYPE6:
@@ -1388,7 +1387,24 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
break;
//标协会员
case PayIncomeContractCommon.PROJECT_TYPE5:
throw new JeroBootException("标协会员类型不可撤销！");
TbMemberProjectSubitem projectSubitem = tbMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
newPaidAmount =subtract(projectSubitem.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(projectSubitem.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(projectSubitem.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
tax = subtract(projectSubitem.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = subtract(projectSubitem.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
projectSubitem.setPaidTax(tax);
projectSubitem.setPaidNoTaxAmount(noTaxAmount);
//更新主列表
projectSubitem.setPaidAmount(newPaidAmount);
projectSubitem.setInAccount(inAccount);
projectSubitem.setPaymentStatus(paymentStatus);
tbMemberProjectSubitemMapper.updateById(projectSubitem);
break;
//标协证书
case PayIncomeContractCommon.PROJECT_TYPE6:
throw new JeroBootException("标协证书类型不可撤销！");
@@ -1477,6 +1493,18 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
member.setPostContactName(mailContactsTemporaryName);
payMemberProjectSubitemMapper.updateById(member);
break;
//标协会员
case PayIncomeContractCommon.PROJECT_TYPE5:
TbMemberProjectSubitem projectSubitem = tbMemberProjectSubitemMapper.selectById(projectId);
if (!Objects.equals(projectSubitem.getMakeInvoice(),0)){
throw new JeroBootException("只有开票为空的可以变更开票类型");
}
//更新主列表
projectSubitem.setInvoiceRequirements(needInvoice);
projectSubitem.setPostContactId(mailContactsId);
tbMemberProjectSubitemMapper.updateById(projectSubitem);
break;
}
}