diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java index 17889bd2..6e11d349 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java @@ -51,7 +51,8 @@ public interface IPayPaymentCheckService extends IService { * @param amountReceivable 应收 * @param paidAmount 实收 * @param paymentStatus 缴费状态 + * @param changeReceivableAmountFlag * @return */ - String getPaymentStatus(BigDecimal amountReceivable,BigDecimal paidAmount,String paymentStatus); + String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 73032929..b0d39608 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -16,7 +16,6 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; @@ -531,7 +530,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl0 && 实收金额 == 待确收金额 && 不等于待审核 + if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0 + && paidAmount.compareTo(amountReceivable) == 0 + && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){ + paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结 + } + }else { + // 实收金额 < 待确收金额 && 不等于待审核/已拒绝 + if(paidAmount.compareTo(amountReceivable) < 0 + && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus) + && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){ + paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传 + } + // 应收>0 && 实收金额 == 待确收金额 + if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0 + && paidAmount.compareTo(amountReceivable) == 0){ + paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结 + } + } - // 实收金额 < 待确收金额 && 不等于待审核/已拒绝 - if(paidAmount.compareTo(amountReceivable) < 0 - && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus) - && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){ - paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传 - } - // 应收>0 && 实收金额 == 待确收金额 - if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0 - && paidAmount.compareTo(amountReceivable) == 0){ - paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结 - } return paymentStatus; } } 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 4128656b..a01a05a3 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 @@ -411,7 +411,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl