From b6335e460ef102e1312a8f928bdd04da4b4b99c8 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Fri, 17 Dec 2021 20:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMailBillServiceImpl.java | 103 ++++++++++++++++-- .../service/IPayPaymentRecordService.java | 2 +- .../impl/PayPaymentRecordServiceImpl.java | 54 ++++++--- 3 files changed, 135 insertions(+), 24 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 6ee619bf..816bfff1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -40,14 +40,8 @@ import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingMapper; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.meeting.service.IPayMeetingService; -import com.jero.member.entity.PayMemberProject; -import com.jero.member.entity.PayMemberProjectSubitem; -import com.jero.member.entity.TbMemberProject; -import com.jero.member.entity.TbMemberProjectSubitem; -import com.jero.member.mapper.PayMemberProjectMapper; -import com.jero.member.mapper.PayMemberProjectSubitemMapper; -import com.jero.member.mapper.TbMemberProjectMapper; -import com.jero.member.mapper.TbMemberProjectSubitemMapper; +import com.jero.member.entity.*; +import com.jero.member.mapper.*; import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.ITbMemberProjectService; import com.jero.modules.system.entity.SysUser; @@ -108,6 +102,8 @@ public class PayMailBillServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMailBillProject::getProjectId, id); + wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE6); + List type6List = payMailBillProjectService.list(wrapper); + + if (type6List != null && type6List.size() > 0) { + throw new JeroBootException("标协证书项目,只能开票一次。"); + } + } } @@ -352,6 +359,24 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 + if(invoiceAmount.compareTo(tbMemberCertificate.getAmountReceivable()) != 0){ + return "开票金额应等于当前未开票金额,输入有误!"; + } + PayCompanyManagement payCompanyManagementTbMemberCer = payCompanyManagementService.getById(tbMemberCertificate.getCompanyId()); + if(!Objects.isNull(payCompanyManagementTbMemberCer) && "2".equals(payCompanyManagementTbMemberCer.getStatus()) ){ + return "企业未审核,需要审核后开票"; + } + break; default: break; } @@ -820,6 +870,34 @@ public class PayMailBillServiceImpl extends ServiceImpl { * 添加一个来款 * @param payPaymentRecord */ - void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List typr5List,Integer flag); + void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List typr5List,List typr6List,Integer flag); /** * 标协会员添加来款 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 71d57701..0ab0a485 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -150,7 +150,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl typr5List = new ArrayList<>(); List typr6List = new ArrayList<>(); for(PayPaymentRecord payPaymentRecord : list){ - addOneAmountReceived(payPaymentRecord,typr5List,flag); + addOneAmountReceived(payPaymentRecord,typr5List,typr6List,flag); } //会员到账推送到会员系统 @@ -294,20 +294,21 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl typr5List,Integer flag){ + public void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List typr5List,List typr6List,Integer flag){ BigDecimal newPaidAmount; Integer inAccount; String principalId = ""; String project = ""; List listId = new ArrayList<>(); + //累加主列表实收金额 + //来款条件校验 + amountReceivedVerification( payPaymentRecord, flag); switch (String.valueOf(payPaymentRecord.getProjectType())){ // 普通项目 case PayIncomeContractCommon.PROJECT_TYPE1: - //来款条件校验 - amountReceivedVerification( payPaymentRecord, flag); PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId()); @@ -329,8 +330,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl