diff --git a/src/main/java/com/example/demo/Util/LanguageTranslationUtil.java b/src/main/java/com/example/demo/Util/LanguageTranslationUtil.java index b10fed0..8f0f8ae 100644 --- a/src/main/java/com/example/demo/Util/LanguageTranslationUtil.java +++ b/src/main/java/com/example/demo/Util/LanguageTranslationUtil.java @@ -28,6 +28,11 @@ public class LanguageTranslationUtil { * @return 对应语言的翻译内容 */ public String translate(String chineseSimplified, String language) { + // 处理空值情况 + if (chineseSimplified == null || chineseSimplified.isEmpty()) { + return chineseSimplified; + } + System.out.println("Translate request - Text: " + chineseSimplified + ", Language: " + language); Translation translation = findTranslationByChinese(chineseSimplified); diff --git a/src/main/java/com/example/demo/controller/coin/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java index a2b8ca7..0b30c10 100644 --- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java @@ -263,14 +263,6 @@ public class ConsumeController { if (user.getGoodsName() != null) { user.setGoodsName(languageTranslationUtil.translate(user.getGoodsName(), lang)); } - // 翻译退款状态 - if (user.getIsRefund() != null) { - if (user.getIsRefund() == 1) { - user.setIsRefundDesc(languageTranslationUtil.translate("已退款", lang)); - } else if (user.getIsRefund() == 0) { - user.setIsRefundDesc(languageTranslationUtil.translate("正常", lang)); - } - } } } } diff --git a/src/main/java/com/example/demo/controller/coin/PermissionController.java b/src/main/java/com/example/demo/controller/coin/PermissionController.java index f16c98d..f81bf6a 100644 --- a/src/main/java/com/example/demo/controller/coin/PermissionController.java +++ b/src/main/java/com/example/demo/controller/coin/PermissionController.java @@ -50,9 +50,6 @@ public class PermissionController { try { List positions = permissionService.getposition(token); - // 解析语言代码 - String languageCode = parseLanguageCode(lang); - // 对职位名称进行多语言转换 translatePositions(positions, lang); @@ -69,9 +66,6 @@ public class PermissionController { try { List markets = permissionService.getmarket(token); - // 解析语言代码 - String languageCode = parseLanguageCode(lang); - // 对市场名称进行多语言转换 translateMarkets(markets, lang); @@ -170,9 +164,6 @@ public class PermissionController { try { List roles = permissionService.getRole(token); - // 解析语言代码 - String languageCode = parseLanguageCode(lang); - // 对角色名称进行多语言转换 translateRoles(roles, lang); diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index 39764b4..990312c 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java @@ -59,7 +59,6 @@ public class ConsumeUser implements Serializable { private String adminName; //提交人姓名 @ExcelProperty(value = "是否退款", converter = RefundConverter.class) private Integer isRefund; //是否退款 - private String isRefundDesc; // 退款状态描述(用于多语言翻译) @ExcelProperty("消耗时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 消费时间 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/TranslationServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/TranslationServiceImpl.java index 78842d9..325f5da 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/TranslationServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/TranslationServiceImpl.java @@ -97,6 +97,11 @@ public class TranslationServiceImpl implements TranslationService { @Override public String findChineseSimplifiedByTranslation(String translatedText, String language) { + // 处理空值情况 + if (translatedText == null || translatedText.isEmpty()) { + return translatedText; + } + Translation translation = null; switch (language.toLowerCase()) { case "en":