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

Merge remote-tracking branch 'origin/seedance' into seedance

This commit is contained in:
old burden 2026-04-15 15:21:05 +08:00
parent abae79949f ff46210c14
commit 3dfa25d23b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.ruoyi.common.utils;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import java.util.Locale;
/** /**
* 获取i18n资源文件 * 获取i18n资源文件
@ -30,4 +31,15 @@ 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)
{
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);
}
} }

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

@ -34,6 +34,7 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.UUID; import java.util.UUID;
/** /**
@ -197,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()); String remark = MessageUtils.message(TASK_SUBMIT_REMARK, aiOrder.getOrderNum(), Locale.CHINESE);
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);
} }
@ -220,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()); String remark = MessageUtils.message("order.number.generation.failed", aiOrder.getOrderNum(), Locale.CHINESE);
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();
@ -328,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()); String remark = MessageUtils.message(TASK_SUCCESS_BACK_FILL_REMARK, order.getOrderNum(), Locale.CHINESE);
aiUserService.addUserBalance(order.getOrderNum(), order.getUserId(), addAmount, aiUserService.addUserBalance(order.getOrderNum(), order.getUserId(), addAmount,
BalanceChangerConstants.REFUND, remark); BalanceChangerConstants.REFUND, remark);
} }