From ff3bd859920f217bbafcab392892f196abaae8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Mon, 6 May 2024 15:18:22 +0800 Subject: [PATCH] 123 --- bashi-admin/src/main/resources/i18n/messages.properties | 3 ++- bashi-admin/src/main/resources/i18n/messages_en_US.properties | 1 + bashi-admin/src/main/resources/i18n/messages_hi_IN.properties | 1 + bashi-admin/src/main/resources/i18n/messages_zh_CN.properties | 3 ++- .../main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bashi-admin/src/main/resources/i18n/messages.properties b/bashi-admin/src/main/resources/i18n/messages.properties index c513da9..40c3338 100644 --- a/bashi-admin/src/main/resources/i18n/messages.properties +++ b/bashi-admin/src/main/resources/i18n/messages.properties @@ -64,10 +64,11 @@ dk.withdraw.remark=\u63D0\u73B0\u4E2D... dk.withdraw.code.null=\u8BF7\u8F93\u5165\u63D0\u73B0\u7801 dk.withdraw.code.error=\u63D0\u73B0\u7801\u9519\u8BEF +dk.borrow.push.not=\u672A\u63D0\u4EA4 dk.borrow.push.success=\u63D0\u4EA4\u6210\u529F dk.borrow.auditing=\u6B63\u5728\u5BA1\u6838 dk.borrow.account.success=\u5230\u8D26\u6210\u529F -dk.borrow.accounting.remark=\u60A8\u7684\u4E2A\u4EBA\u4FE1\u7528\u8D37\u6B3E\u6B63\u5728\u5BA1\u6838\uFF0C\u8BF7\u7559\u610F\u60A8\u7684\u5BA1\u6838\u72B6\u6001\uFF01\u5982\u6709\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u4E1A\u52A1\u5458\u54A8\u8BE2\u2026 +dk.borrow.accounting.remark=\u8BF7\u60A8\u5B8C\u5584\u8D44\u6599,\u63D0\u4EA4\u7533\u8BF7 dk.borrow.contract.error=\u501F\u6B3E\u4E0D\u5B58\u5728 dk.customer.update.having.loans=\u8D37\u6B3E\u5DF2\u63D0\u4EA4\u65E0\u6CD5\u4FEE\u6539\u4FE1\u606F\uFF0C\u8BF7\u8054\u7CFB\u5BA2\u670D diff --git a/bashi-admin/src/main/resources/i18n/messages_en_US.properties b/bashi-admin/src/main/resources/i18n/messages_en_US.properties index 59a1226..a56beab 100644 --- a/bashi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/bashi-admin/src/main/resources/i18n/messages_en_US.properties @@ -64,6 +64,7 @@ dk.withdraw.remark=Withdrawal in progress... dk.withdraw.code.null=Please enter withdrawal code dk.withdraw.code.error=Withdrawal code error +dk.borrow.push.not=not submit dk.borrow.push.success=Submission successful dk.borrow.auditing=Currently under review dk.borrow.account.success=Amount successfully credited diff --git a/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties b/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties index 917490a..7998a50 100644 --- a/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties +++ b/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties @@ -62,6 +62,7 @@ dk.withdraw.remark=\u0928\u093F\u0915\u093E\u0938\u0940 \u092A\u094D\u0930\u0915 dk.withdraw.code.null=\u8BF7\u8F93\u5165\u63D0\u73B0\u7801 dk.withdraw.code.error=\u63D0\u73B0\u7801\u9519\u8BEF +dk.borrow.push.not=\u672A\u63D0\u4EA4 dk.borrow.push.success=\u0938\u092B\u0932\u0924\u093E\u092A\u0942\u0930\u094D\u0935\u0915 \u092A\u094D\u0930\u0938\u094D\u0924\u0941\u0924 dk.borrow.auditing=\u0938\u092E\u0940\u0915\u094D\u0937\u093E \u0915\u0947 \u0905\u0927\u0940\u0928 \u0939\u0948 dk.borrow.account.success=\u0939\u093F\u0938\u093E\u092C \u0938\u092B\u0932 diff --git a/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties b/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties index c513da9..40c3338 100644 --- a/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -64,10 +64,11 @@ dk.withdraw.remark=\u63D0\u73B0\u4E2D... dk.withdraw.code.null=\u8BF7\u8F93\u5165\u63D0\u73B0\u7801 dk.withdraw.code.error=\u63D0\u73B0\u7801\u9519\u8BEF +dk.borrow.push.not=\u672A\u63D0\u4EA4 dk.borrow.push.success=\u63D0\u4EA4\u6210\u529F dk.borrow.auditing=\u6B63\u5728\u5BA1\u6838 dk.borrow.account.success=\u5230\u8D26\u6210\u529F -dk.borrow.accounting.remark=\u60A8\u7684\u4E2A\u4EBA\u4FE1\u7528\u8D37\u6B3E\u6B63\u5728\u5BA1\u6838\uFF0C\u8BF7\u7559\u610F\u60A8\u7684\u5BA1\u6838\u72B6\u6001\uFF01\u5982\u6709\u7591\u95EE\uFF0C\u8BF7\u8054\u7CFB\u4E1A\u52A1\u5458\u54A8\u8BE2\u2026 +dk.borrow.accounting.remark=\u8BF7\u60A8\u5B8C\u5584\u8D44\u6599,\u63D0\u4EA4\u7533\u8BF7 dk.borrow.contract.error=\u501F\u6B3E\u4E0D\u5B58\u5728 dk.customer.update.having.loans=\u8D37\u6B3E\u5DF2\u63D0\u4EA4\u65E0\u6CD5\u4FEE\u6539\u4FE1\u606F\uFF0C\u8BF7\u8054\u7CFB\u5BA2\u670D 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 5881295..776d8c9 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 @@ -244,7 +244,7 @@ public class BorrowServiceImpl extends ServiceImpl impleme LoanProcessResp resp = new LoanProcessResp(); List borrowStep = new ArrayList<>(); if(one == null){ - borrowStep.add(new BorrowStepResp(MessageUtils.message("dk.borrow.push.success"),false)); + borrowStep.add(new BorrowStepResp(MessageUtils.message("dk.borrow.push.not"),false)); borrowStep.add(new BorrowStepResp(MessageUtils.message("dk.borrow.auditing"),false)); borrowStep.add(new BorrowStepResp(MessageUtils.message("dk.borrow.account.success"),false)); resp.setBorrowStep(borrowStep);