From b3459fc01fd6dd19ca15313221635283ac32af03 Mon Sep 17 00:00:00 2001 From: yys <47@gamerwa.com> Date: Wed, 15 Apr 2026 16:01:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E7=94=9F=E6=88=90=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E4=BA=A7=E7=94=9F=E7=9A=84=E6=B5=81=E6=B0=B4=E7=9A=84?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=EF=BC=8C=E7=94=A8=E5=90=8C=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/i18n/messages.properties | 6 +++--- .../src/main/resources/i18n/messages_en_US.properties | 2 +- .../java/com/ruoyi/common/utils/MessageUtils.java | 11 +++++++---- .../com/ruoyi/ai/service/impl/AiOrderServiceImpl.java | 6 +++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/web-api/ruoyi-admin/src/main/resources/i18n/messages.properties b/web-api/ruoyi-admin/src/main/resources/i18n/messages.properties index 9490f31..2a52403 100644 --- a/web-api/ruoyi-admin/src/main/resources/i18n/messages.properties +++ b/web-api/ruoyi-admin/src/main/resources/i18n/messages.properties @@ -38,6 +38,6 @@ no.export.permission=您没有导出数据的权限，请联系管理员添加 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] # video generation -order.number.generation.failed=订单号 {0} 生成失败，请稍后重试。 -order.number.generation.submit=订单号 {0} 生成任务已提交！ -order.number.generation.successbackfill=订单号 {0} 生成成功！金额已回补！ \ No newline at end of file +order.number.generation.failed=订单号 {0} 生成视频任务失败。 +order.number.generation.submit=订单号 {0} 生成视频任务已提交！预扣金额。 +order.number.generation.successbackfill=订单号 {0} 生成视频任务成功！金额已回补！ \ No newline at end of file diff --git a/web-api/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/web-api/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties index 35e7c9e..0360fc0 100644 --- a/web-api/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/web-api/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -32,6 +32,6 @@ user.not.found=User not found. user.password.incorrect=Password is incorrect, please try again. # video generation -order.number.generation.failed=Order number {0} generation failed, please try again later. +order.number.generation.failed=Order number {0} generation failed. order.number.generation.submit=Order number {0} generation task submitted! order.number.generation.successbackfill=Order number {0} sucessed! Amount is back filled! \ No newline at end of file diff --git a/web-api/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/web-api/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java index 1c26e01..0088d54 100644 --- a/web-api/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/web-api/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java @@ -12,6 +12,8 @@ import java.util.Locale; */ public class MessageUtils { + private static final Locale defaultLocale = Locale.ROOT; + /** * 根据消息键和参数 获取消息 委托给spring messageSource * @@ -31,15 +33,16 @@ public class MessageUtils return messageSource.getMessage(code, null, code, LocaleContextHolder.getLocale()); } - public static String messageByLocal(String code, Locale locale) + public static String messageByDefaultLocal(String code) { MessageSource messageSource = SpringUtils.getBean(MessageSource.class); - return messageSource.getMessage(code, null, code, LocaleContextHolder.getLocale()); + return messageSource.getMessage(code, null, code, defaultLocale); } - public static String messageByLocal(String code, Locale locale, Object... args) + public static String messageByDefaultLocal(String code, Object... args) { MessageSource messageSource = SpringUtils.getBean(MessageSource.class); - return messageSource.getMessage(code, args, code, locale); + return messageSource.getMessage(code, args, code, defaultLocale); } + } diff --git a/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/AiOrderServiceImpl.java b/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/AiOrderServiceImpl.java index 833ab3d..4bedaca 100644 --- a/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/AiOrderServiceImpl.java +++ b/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/AiOrderServiceImpl.java @@ -198,7 +198,7 @@ public class AiOrderServiceImpl implements IAiOrderService { aiOrderMapper.insert(aiOrder); // 执行余额变更 if (isReduceBalance) { - String remark = MessageUtils.message(TASK_SUBMIT_REMARK, aiOrder.getOrderNum(), Locale.CHINESE); + String remark = MessageUtils.messageByDefaultLocal(TASK_SUBMIT_REMARK, aiOrder.getOrderNum()); aiUserService.addUserBalance(orderno, SecurityUtils.getAiUserId() , NumberUtil.mul(-1, aiManager.getPrice()), getChangerType(aiType), remark); } @@ -221,7 +221,7 @@ public class AiOrderServiceImpl implements IAiOrderService { public void orderFailure(AiOrder aiOrder, BigDecimal amount) { aiOrder.setIsBackfilled(1); aiOrder.setStatus(2); - String remark = MessageUtils.message("order.number.generation.failed", aiOrder.getOrderNum(), Locale.CHINESE); + String remark = MessageUtils.messageByDefaultLocal("order.number.generation.failed", aiOrder.getOrderNum()); aiOrder.setRemark(remark); aiOrderMapper.updateById(aiOrder); Long userId = aiOrder.getUserId() != null ? aiOrder.getUserId() : SecurityUtils.getAiUserId(); @@ -329,7 +329,7 @@ public class AiOrderServiceImpl implements IAiOrderService { BigDecimal addAmount = order.getPreDeductAmount().subtract(realAmount); if (addAmount.compareTo(new BigDecimal(0)) != 0) { // 回补 - String remark = MessageUtils.message(TASK_SUCCESS_BACK_FILL_REMARK, order.getOrderNum(), Locale.CHINESE); + String remark = MessageUtils.messageByDefaultLocal(TASK_SUCCESS_BACK_FILL_REMARK, order.getOrderNum()); aiUserService.addUserBalance(order.getOrderNum(), order.getUserId(), addAmount, BalanceChangerConstants.REFUND, remark); }