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 b5be577..1c26e01 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 @@ -3,6 +3,7 @@ package com.ruoyi.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import com.ruoyi.common.utils.spring.SpringUtils; +import java.util.Locale; /** * 获取i18n资源文件 @@ -30,4 +31,15 @@ public class MessageUtils return messageSource.getMessage(code, null, code, LocaleContextHolder.getLocale()); } + public static String messageByLocal(String code, Locale locale) + { + MessageSource messageSource = SpringUtils.getBean(MessageSource.class); + return messageSource.getMessage(code, null, code, LocaleContextHolder.getLocale()); + } + + public static String messageByLocal(String code, Locale locale, Object... args) + { + MessageSource messageSource = SpringUtils.getBean(MessageSource.class); + return messageSource.getMessage(code, args, code, locale); + } } 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 95bc513..833ab3d 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 @@ -34,6 +34,7 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.UUID; /** @@ -197,7 +198,7 @@ public class AiOrderServiceImpl implements IAiOrderService { aiOrderMapper.insert(aiOrder); // 执行余额变更 if (isReduceBalance) { - String remark = MessageUtils.message(TASK_SUBMIT_REMARK, aiOrder.getOrderNum()); + String remark = MessageUtils.message(TASK_SUBMIT_REMARK, aiOrder.getOrderNum(), Locale.CHINESE); aiUserService.addUserBalance(orderno, SecurityUtils.getAiUserId() , NumberUtil.mul(-1, aiManager.getPrice()), getChangerType(aiType), remark); } @@ -220,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()); + String remark = MessageUtils.message("order.number.generation.failed", aiOrder.getOrderNum(), Locale.CHINESE); aiOrder.setRemark(remark); aiOrderMapper.updateById(aiOrder); Long userId = aiOrder.getUserId() != null ? aiOrder.getUserId() : SecurityUtils.getAiUserId(); @@ -328,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()); + String remark = MessageUtils.message(TASK_SUCCESS_BACK_FILL_REMARK, order.getOrderNum(), Locale.CHINESE); aiUserService.addUserBalance(order.getOrderNum(), order.getUserId(), addAmount, BalanceChangerConstants.REFUND, remark); }