fix 83127 83180 会员申请开票

This commit is contained in:
lijiarao
2024-03-28 17:19:41 +08:00
parent c5e312335f
commit 28d19194da
@@ -599,40 +599,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
TbCheckVo tbCheckVo = new TbCheckVo();
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
//已同意
//如果没有发票就存入0
BigDecimal noTaxAmount;
BigDecimal tax;
BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
if (tbMember.getInvoiceRequirements() == 0) {
noTaxAmount = amountReceived;
tax = BigDecimal.ZERO;
}else {
noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
tax = amountReceived.subtract(noTaxAmount);
}
payPaymentRecord.setTax(tax);
payPaymentRecord.setNoTaxAmount(noTaxAmount);
//来款条件校验
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
payPaymentRecords.add(payPaymentRecord);
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
tbMember.setPaidAmount(newPaidAmount);
tbMember.setInAccount(inAccount);
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
tbMember.setPaymentStatus(paymentStatus);
//插入来款记录表
payPaymentRecord.setId(null);
payPaymentRecord.setPaymentStatus(paymentStatus);
payPaymentRecord.setNoTaxAmount(noTaxAmount);
payPaymentRecord.setTax(tax);
payPaymentRecordMapper.insert(payPaymentRecord);
//保存税额
tbMember.setConfirmTax(tax);
tbMember.setConfirmNoTaxAmount(noTaxAmount);
tbCheckVo.setCheckResult(PayProjectCommon.YES);
//发消息
PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbMember.getLiaisonManId());
if(!Objects.isNull(tbMemberPayContactsManagement)){