From 6e6d39b031b353bc543583209f90e9c1c363a1c9 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:54:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40596?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/ProjectDetailServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 8c2260f4..7f9ba235 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 @@ -310,16 +310,16 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.equals(payCommonProject.getNeedInvoice(),ProjectCommon.NEED_INVOICE0)){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); }else{ - // 开票金额 = 应收金额 || 开票金额 = 到账金额 = 1 - if(invoice.compareTo(receivableAmount) == 0 || invoice.compareTo(payCommonProject.getPaidAmount()) == 0){ + // 开票金额 = 应收金额 = 1 + if(invoice.compareTo(receivableAmount) == 0 ){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE1); } // 开票金额 = 0 = 0 if(invoice.compareTo(new BigDecimal("0.00")) == 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); } - // 开票金额 > 0 && 开票金额 < 实收金额 = 2 - if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getPaidAmount()) < 0){ + // 开票金额 > 0 && 开票金额 < 应收金额 = 2 + if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2); } }