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

fix 合并开票时的校验,翻转equals

Browse Source
This commit is contained in:
lijiarao
2021-09-14 15:44:52 +08:00
parent d6be457a20
commit 858279791e
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+15 -4
View File
@@ -22,6 +22,8 @@ import com.jero.meeting.service.IPayMeetingService;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.meeting.valid.group.*;
import com.jero.meeting.vo.*;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.project.common.PayProjectCommon;
import com.jero.standards.memberinfo.service.IMemberInfoService;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
@@ -67,6 +69,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
private ISysBaseAPI iSysBaseApi;
@Resource
private IPayMailBillService payMailBillService;
@Resource
private IPayPaymentRecordService payPaymentRecordService;
/**
* 保存
@@ -148,6 +152,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
meetingSituation.setCheckResult(checkResult);
saveOrUpdate(meetingSituation);
PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
payPaymentRecord.setProjectId(meetingSituation.getId());
payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable());
payPaymentRecord.setPaymentDate(new Date());
payPaymentRecordService.addPhase(payPaymentRecord);
}
@Override
@@ -171,16 +182,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (!payMeetingSituation1.getCompanyId().equals(payMeetingSituation.getCompanyId())) {
throw new JeroBootException("合并开票只能是同一企业");
}
if (amountReceivable.equals(new BigDecimal("0"))) {
if (amountReceivable.compareTo(new BigDecimal("0")) == 0) {
throw new JeroBootException("应收金额为0，不能合并开票");
}
if (payMeetingSituation1.getPayMode().equals(MeetingSubitemCommon.PAY_MODE_PACK)) {
if (MeetingSubitemCommon.PAY_MODE_PACK.equals(payMeetingSituation1.getPayMode())) {
throw new JeroBootException("缴费方式为打包，不能合并开票");
}
if (payMeetingSituation1.getNeedInvoice().equals(PayProjectCommon.NO)) {
if (PayProjectCommon.NO.equals(payMeetingSituation1.getNeedInvoice())) {
throw new JeroBootException("不需要发票，不能合并开票");
}
if (!payMeetingSituation1.getMakeInvoice().equals(PayProjectCommon.NO)) {
if (!PayProjectCommon.NO.equals(payMeetingSituation1.getMakeInvoice())) {
throw new JeroBootException("已经开票的，不能合并开票");
}
allAmount = amountReceivable.add(allAmount);