best_yunwei
/
ai_images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix： 生成视频产生的流水的备注，用同一个语言

This commit is contained in:
yys 2026-04-15 16:01:49 +08:00
parent ff46210c14
commit b3459fc01f
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-api/ruoyi-admin/src/main/resources/i18n/messages.properties
View File

@ -38,6 +38,6 @@ no.export.permission=您没有导出数据的权限，请联系管理员添加
no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
# video generation # video generation
order.number.generation.failed=订单号 {0} 生成失败，请稍后重试。 order.number.generation.failed=订单号 {0} 生成视频任务失败。
order.number.generation.submit=订单号 {0} 生成任务已提交！ order.number.generation.submit=订单号 {0} 生成视频任务已提交！预扣金额。
order.number.generation.successbackfill=订单号 {0} 生成成功！金额已回补！ order.number.generation.successbackfill=订单号 {0} 生成视频任务成功！金额已回补！

2
web-api/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
View File

@ -32,6 +32,6 @@ user.not.found=User not found.
user.password.incorrect=Password is incorrect, please try again. user.password.incorrect=Password is incorrect, please try again.
# video generation # 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.submit=Order number {0} generation task submitted!
order.number.generation.successbackfill=Order number {0} sucessed! Amount is back filled! order.number.generation.successbackfill=Order number {0} sucessed! Amount is back filled!

11
web-api/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
View File

@ -12,6 +12,8 @@ import java.util.Locale;
*/ */
public class MessageUtils public class MessageUtils
{ {
private static final Locale defaultLocale = Locale.ROOT;
/** /**
* 根据消息键和参数 获取消息 委托给spring messageSource * 根据消息键和参数 获取消息 委托给spring messageSource
* *
@ -31,15 +33,16 @@ public class MessageUtils
return messageSource.getMessage(code, null, code, LocaleContextHolder.getLocale()); 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); 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); MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
return messageSource.getMessage(code, args, code, locale); return messageSource.getMessage(code, args, code, defaultLocale);
} }
} }

6
web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/AiOrderServiceImpl.java
View File

@ -198,7 +198,7 @@ public class AiOrderServiceImpl implements IAiOrderService {
aiOrderMapper.insert(aiOrder); aiOrderMapper.insert(aiOrder);
// 执行余额变更 // 执行余额变更
if (isReduceBalance) { 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() aiUserService.addUserBalance(orderno, SecurityUtils.getAiUserId()
, NumberUtil.mul(-1, aiManager.getPrice()), getChangerType(aiType), remark); , NumberUtil.mul(-1, aiManager.getPrice()), getChangerType(aiType), remark);
} }
@ -221,7 +221,7 @@ public class AiOrderServiceImpl implements IAiOrderService {
public void orderFailure(AiOrder aiOrder, BigDecimal amount) { public void orderFailure(AiOrder aiOrder, BigDecimal amount) {
aiOrder.setIsBackfilled(1); aiOrder.setIsBackfilled(1);
aiOrder.setStatus(2); 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); aiOrder.setRemark(remark);
aiOrderMapper.updateById(aiOrder); aiOrderMapper.updateById(aiOrder);
Long userId = aiOrder.getUserId() != null ? aiOrder.getUserId() : SecurityUtils.getAiUserId(); Long userId = aiOrder.getUserId() != null ? aiOrder.getUserId() : SecurityUtils.getAiUserId();
@ -329,7 +329,7 @@ public class AiOrderServiceImpl implements IAiOrderService {
BigDecimal addAmount = order.getPreDeductAmount().subtract(realAmount); BigDecimal addAmount = order.getPreDeductAmount().subtract(realAmount);
if (addAmount.compareTo(new BigDecimal(0)) != 0) { 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, aiUserService.addUserBalance(order.getOrderNum(), order.getUserId(), addAmount,
BalanceChangerConstants.REFUND, remark); BalanceChangerConstants.REFUND, remark);
} }