From 5a6e1bea2106e873a0c0d7e18622fd767e4f71a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Fri, 15 Oct 2021 17:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40784?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mail/service/IPayMailBillService.java | 2 +- .../service/impl/PayMailBillServiceImpl.java | 29 +++++++++---------- .../impl/PayPaymentRecordServiceImpl.java | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 437e1309..ec363103 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -49,7 +49,7 @@ public interface IPayMailBillService extends IService { * @param payMailBillVo * @return */ - Result editPayBill(PayMailBillVO payMailBillVo); + void editPayBill(PayMailBillVO payMailBillVo); /** * 推送邮寄数据到会员系统 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 1f88d1a7..bf879b68 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 @@ -146,7 +146,7 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList = payMailBill.getBmpList(); - //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额，企业名称是否审核 + //校验不同项目是否属于同一个公司，开票金额是否大于当前未开票金额，企业名称是否审核 String res = checkCompanyProject(bmpList); if (!"success".equals(res)) { return Result.error(res); @@ -290,7 +290,7 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { String standardCompanyId = null;//基准公司id @@ -321,7 +321,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId()); if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){ @@ -346,7 +346,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(workingGroup.getChargeCompanyTemporaryId()); if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){ @@ -371,7 +371,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } // TODO 缺少会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以来款 PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId()); @@ -680,13 +680,14 @@ public class PayMailBillServiceImpl extends ServiceImpl editPayBill(PayMailBillVO payMailBillVo){ + @Override + public void editPayBill(PayMailBillVO payMailBillVo){ //查出没编辑之前的开票记录 PayMailBillProject oldBmp = payMailBillProjectMapper.selectById(payMailBillVo.getBmpId()); - //校验开票金额是否大于当前欠未开票金额 + //校验开票金额是否大于当前未开票金额 String res = editCheckCompanyProject(payMailBillVo,oldBmp); if (!"success".equals(res)) { - return Result.error(res); + throw new JeroBootException(res); } //更新票据邮寄表 @@ -698,11 +699,9 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } break; // 工作组项目 @@ -748,7 +747,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } break; //会议项目 @@ -766,7 +765,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } break; //会员项目 @@ -784,7 +783,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){ - return "开票金额大于当前欠未开票金额，输入有误！"; + return "开票金额大于当前未开票金额，输入有误！"; } break; //标协会员 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 ea9bd7ee..0ba26d19 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 @@ -169,7 +169,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl