diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 742e6113..8c2260f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -242,7 +242,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(StringUtils.isBlank(projectId)){ throw new JeroBootException("项目id不能为空!"); } - if(Objects.isNull(receivableAmount) ||receivableAmount.compareTo(new BigDecimal("0.00")) == 0){ + if(Objects.isNull(receivableAmount)){ return null; } // 获取项目信息 @@ -256,11 +256,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCommonProject.getPaidAmount())){ payCommonProject.setPaidAmount(new BigDecimal("0.00")); } - // 应收金额没有变更 && 验证来款方式没有变更 if(receivableAmount.compareTo(payCommonProject.getReceivableAmount()) == 0 && needInvoice.equals(payCommonProject.getNeedInvoice())){ return null; } + // 验证应收金额不能小于实收金额 + if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) < 0){ + throw new JeroBootException("应收金额不能小于实收金额!"); + } // 验证来款方式,有变更,按照变更处理 if(!needInvoice.equals(payCommonProject.getNeedInvoice())){ payCommonProject.setNeedInvoice(needInvoice); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java index a2d57534..1b0d8466 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java @@ -122,8 +122,11 @@ public class PayPackCompanyProjectController extends JeroController