From a16bc85a5eec94b13f7bcd5ed309031f3e136b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Tue, 7 May 2024 09:36:48 +0800 Subject: [PATCH] 123 --- bashi-admin/src/main/resources/i18n/messages.properties | 1 + .../java/com/bashi/dk/service/impl/BorrowServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bashi-admin/src/main/resources/i18n/messages.properties b/bashi-admin/src/main/resources/i18n/messages.properties index 40c3338..a55ddc0 100644 --- a/bashi-admin/src/main/resources/i18n/messages.properties +++ b/bashi-admin/src/main/resources/i18n/messages.properties @@ -57,6 +57,7 @@ dk.loan.amount.notGe=\u8D37\u6B3E\u91D1\u989D\u4E0D\u80FD\u5927\u4E8E dk.loan.auditing=\u5BA1\u6838\u4E2D dk.loan.auditing.remark=\u5BA1\u6838\u4E2D... dk.withdraw.account.error=\u63D0\u73B0\u5931\u8D25\uFF0C\u8D26\u53F7\u5F02\u5E38 +dk.withdraw.account.noStatus=\u63D0\u73B0\u5931\u8D25\uFF0C\u8BF7\u5148\u7533\u8BF7\u8D37\u6B3E dk.withdraw.balance.not.enough.error=\u4F59\u989D\u4E0D\u8DB3 dk.withdraw.fail=\u63D0\u73B0\u5931\u8D25 dk.withdraw.ing=\u63D0\u73B0\u4E2D diff --git a/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java b/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java index d91d32b..01eff6c 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java +++ b/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java @@ -202,13 +202,13 @@ public class BorrowServiceImpl extends ServiceImpl impleme } Borrow borrow = this.getByCustomerId(customerId); if(borrow == null){ - throw new CustomException(MessageUtils.message("dk.withdraw.account.error")); + throw new CustomException(MessageUtils.message("dk.withdraw.account.noStatus")); } if(borrow.getBorrowStatusId() != null){ BorrowStatus borrowStatus = borrowStatusService.getById(borrow.getBorrowStatusId()); if(borrowStatus != null){ if(BooleanUtils.isFalse(borrowStatus.getWithdrawFlag())){ - throw new CustomException(MessageUtils.message("dk.withdraw.account.error")); + throw new CustomException(borrowStatus.getBorrowRemark()); } } }