diff --git a/src/main/java/com/example/demo/controller/cash/MessageController.java b/src/main/java/com/example/demo/controller/cash/MessageController.java index 764e21e..b69ecbb 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -5,6 +5,7 @@ import com.example.demo.Util.LanguageTranslationUtil; import com.example.demo.domain.DTO.IdRequest; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.vo.cash.Status; +import com.example.demo.domain.vo.coin.Messages; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.cash.MessageService; import com.example.demo.service.coin.MarketService; @@ -59,7 +60,8 @@ public class MessageController { String languageCode = parseLanguageCode(lang); // 如果不是中文环境,将查询条件中的翻译文本转换为中文简体 if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) { - convertTranslatedFieldsToChinese(status, languageCode); + List messages = messageService.getMessage(markets, status.getStatus()); + convertTranslatedFieldsToChinese((Messages) messages, languageCode); } // 权限校验逻辑 @@ -130,10 +132,20 @@ public class MessageController { /** * 将查询条件中的翻译字段转换为中文简体 */ - private void convertTranslatedFieldsToChinese(Status status, String languageCode) { - if (status != null) { - // 如果状态相关的字段需要翻译,可以在这里处理 - // 目前 Status 类中主要是状态码,一般不需要翻译 + private void convertTranslatedFieldsToChinese(Messages messages, String languageCode) { + if (messages != null) { + // 翻译标题 + if (messages.getTitle() != null && !messages.getTitle().isEmpty()) { + messages.setTitle(languageTranslationUtil.translate(messages.getTitle(), languageCode)); + } + // 翻译描述 + if (messages.getDesc() != null && !messages.getDesc().isEmpty()) { + messages.setDesc(languageTranslationUtil.translate(messages.getDesc(), languageCode)); + } + // 翻译市场名称 + if (messages.getMarketName() != null && !messages.getMarketName().isEmpty()) { + messages.setMarketName(languageTranslationUtil.translate(messages.getMarketName(), languageCode)); + } } } } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index db76d10..2bd7573 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -140,13 +140,13 @@ public class CashCollectionServiceImpl implements CashCollectionService { message.setJwcode(cashRecord.getJwcode()); message.setName(cashRecord.getName()); message.setStatus(cashRecord.getStatus()); - message.setDesc(cashRecord.getJwcode()+languageTranslationUtil.translate("用户的现金收款申请待审核,请前往审核", lang)); - message.setTitle(languageTranslationUtil.translate("现金收款--新增收款", lang)); + message.setDesc(cashRecord.getJwcode()+"用户的现金收款申请待审核,请前往审核"); + message.setTitle("现金收款--新增收款"); message.setType(1); message.setTypeId(cashRecord.getId()); message.setMarket(Integer.valueOf(cashRecord.getMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); - message.setMarketName(languageTranslationUtil.translate(marketName, lang)); + message.setMarketName(marketName); rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_COLLECTION_EXCHANGE, "cash.collection.save", message); return "添加成功"; } @@ -193,13 +193,13 @@ public class CashCollectionServiceImpl implements CashCollectionService { message.setJwcode(cashRecord.getJwcode()); message.setName(cashRecord.getName()); message.setStatus(cashRecord.getStatus()); - message.setDesc(cashRecord.getJwcode()+languageTranslationUtil.translate("用户的现金收款申请待审核,请前往审核", lang)); - message.setTitle(languageTranslationUtil.translate("现金收款--赠送免费金币", lang)); + message.setDesc(cashRecord.getJwcode()+"用户的现金收款申请待审核,请前往审核"); + message.setTitle("现金收款--赠送免费金币"); message.setType(1); message.setTypeId(cashRecord.getId()); message.setMarket(Integer.valueOf(cashRecord.getMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); - message.setMarketName(languageTranslationUtil.translate(marketName, lang)); + message.setMarketName(marketName); rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_COLLECTION_EXCHANGE, "cash.collection.save", message); return "添加成功"; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index d713784..527ae99 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -211,13 +211,13 @@ public class CashRefundServiceImpl implements RefundService { message.setJwcode(cashRecordRefund.getJwcode()); message.setName(cashRecordRefund.getName()); message.setStatus(cashRecordRefund.getStatus()); - message.setDesc(cashRecordRefund.getJwcode()+languageTranslationUtil.translate("用户的客服退款申请待审核,前往处理", lang)); - message.setTitle(languageTranslationUtil.translate("现金退款--新增退款", lang)); + message.setDesc(cashRecordRefund.getJwcode()+"用户的客服退款申请待审核,前往处理"); + message.setTitle("现金退款--新增退款"); message.setType(0); message.setTypeId(cashRecordRefund.getId()); message.setMarket(Integer.valueOf(cashRecordRefund.getMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); - message.setMarketName(languageTranslationUtil.translate(marketName, lang)); + message.setMarketName(marketName); rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message); return Result.success("提交成功").getCode(); @@ -255,13 +255,13 @@ public class CashRefundServiceImpl implements RefundService { message.setJwcode(cashRecordDTO.getJwcode()); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); - message.setDesc(cashRecordDTO.getJwcode() + languageTranslationUtil.translate("用户的退款申请待审核,前往处理", lang)); - message.setTitle(languageTranslationUtil.translate("现金退款--当地退款审核(编辑后提交)", lang)); + message.setDesc(cashRecordDTO.getJwcode() + "用户的退款申请待审核,前往处理"); + message.setTitle("现金退款--当地退款审核(编辑后提交)"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); message.setMarket(cashRecordDTO.getMarket()); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); - message.setMarketName(languageTranslationUtil.translate(marketName, lang)); + message.setMarketName(marketName); rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message); } return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode(); @@ -294,13 +294,13 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); message.setJwcode(cashRecordDTO.getJwcode()); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); - message.setDesc(cashRecordDTO.getJwcode()+cashRecordDTO.getStatus()!=12|| cashRecordDTO.getStatus()!=22?languageTranslationUtil.translate("用户的退款申请待审核,前往处理", lang):languageTranslationUtil.translate("用户的现金退款申请已被驳回,前往查看详情", lang)); - message.setTitle(languageTranslationUtil.translate("现金退款--当地退款审核", lang)); + message.setDesc(cashRecordDTO.getJwcode()+cashRecordDTO.getStatus()!=12|| cashRecordDTO.getStatus()!=22?"用户的退款申请待审核,前往处理":"用户的现金退款申请已被驳回,前往查看详情"); + message.setTitle("现金退款--当地退款审核"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); message.setMarket(cashRecordDTO.getMarket()); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); - message.setMarketName(languageTranslationUtil.translate(marketName, lang)); + message.setMarketName(marketName); rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message); @@ -416,13 +416,13 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); message.setJwcode(cashRecordDTO.getJwcode()); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); - message.setDesc(cashRecordDTO.getJwcode()+cashRecordDTO.getStatus()!=32?languageTranslationUtil.translate("用户的退款申请待审核,前往处理", lang):languageTranslationUtil.translate("用户的现金退款申请已被驳回,前往查看详情", lang)); - message.setTitle(languageTranslationUtil.translate("现金退款--执行人退款提交", lang)); + message.setDesc(cashRecordDTO.getJwcode()+cashRecordDTO.getStatus()!=32?"用户的退款申请待审核,前往处理":"用户的现金退款申请已被驳回,前往查看详情"); + message.setTitle("现金退款--执行人退款提交"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); message.setMarket(cashRecordDTO.getMarket()); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); - message.setMarketName(languageTranslationUtil.translate(marketName, "zh_CN")); + message.setMarketName(marketName); } return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode();