From f4966bcc444c1504d050aa848824127bfaf66de8 Mon Sep 17 00:00:00 2001
From: wangguorui <2069821375@qq.com>
Date: Sat, 24 Jan 2026 11:39:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E6=9C=8824=E6=97=A5=EF=BC=8C=E8=B7=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/cash/CashCollectionController.java    | 20 ++++++++++++++++++--
 .../demo/service/cash/CashCollectionService.java     |  2 +-
 .../serviceImpl/cash/CashCollectionServiceImpl.java  | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java
index 1c0e554..f174ebe 100644
--- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java
+++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java
@@ -52,11 +52,27 @@ public class CashCollectionController {
     //根据精网号获取姓名和地区
     @PostMapping("/getNameAndMarket")
     public Result getNameAndMarket(@RequestBody Integer jwcode, @RequestHeader(defaultValue = "zh_CN") String lang) {
-        // 直接返回服务层的 Result 对象
-        return cashCollectionService.getNameAndMarket(jwcode);
+        try {
+            Result result = cashCollectionService.getNameAndMarket(jwcode, lang);
+
+            // 对返回结果进行多语言转换
+            if (result.getCode() == 200 && result.getData() instanceof User) {
+                User user = (User) result.getData();
+                // 如果服务层未处理市场名称翻译，在这里进行处理
+                if (user.getMarketName() != null) {
+                    user.setMarketName(languageTranslationUtil.translate(user.getMarketName(), lang));
+                }
+            }
+
+            return result;
+        } catch (Exception e) {
+            String errorMsg = languageTranslationUtil.translate("查询失败", lang);
+            return Result.error(errorMsg + ": " + e.getMessage());
+        }
     }
 
 
+
     //获取收款活动列表
     @PostMapping("/getActivityList")
     public Result getActivityList()
diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java
index 9cf3f9d..cce5238 100644
--- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java
+++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java
@@ -34,7 +34,7 @@ public interface CashCollectionService {
     //补全手续费等
     String complete(CashRecord cashRecord);
     //根据精网号获取姓名和地区
-    Result getNameAndMarket(Integer jwcode);
+    Result getNameAndMarket(Integer jwcode,String lang);
     //获取活动列表
     List<RechargeActivity> getActivityList();
     //同步g_order订单到cash_record表
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 9d5546c..2bca386 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -363,7 +363,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
 
     //根据精网号查询姓名和地区
     @Override
-    public Result getNameAndMarket(Integer jwcode) {
+    public Result getNameAndMarket(Integer jwcode,@RequestHeader(defaultValue = "zh_CN") String lang) {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String token = request.getHeader("token");
@@ -376,7 +376,8 @@ public class CashCollectionServiceImpl implements CashCollectionService {
                 // 检查用户是否存在
                 int userCount = cashCollectionMapper.checkUserExists(jwcode);
                 if (userCount == 0) {
-                    return Result.error("用户为空");
+                    String message = languageTranslationUtil.translate("精网号有误！请检查", lang);
+                    return Result.error(message);
                 }
 
                 if (markets.contains("9") || markets.contains("9999")) {
@@ -400,17 +401,22 @@ public class CashCollectionServiceImpl implements CashCollectionService {
                     } else {
                         // 无权限，返回用户所属地区
                         String userMarketName = cashCollectionMapper.getMarketNameByJwcode(jwcode);
-                        return Result.errorWithData("无权限访问", java.util.Map.of("market", userMarketName));
+                        String translatedMarketName = languageTranslationUtil.translate(userMarketName, lang);
+                        String message = languageTranslationUtil.translate("无权限访问", lang);
+                        return Result.errorWithData(message, java.util.Map.of("market", translatedMarketName));
                     }
                 }
             } else {
                 // admin 为 null，即权限验证失败
                 String userMarketName = cashCollectionMapper.getMarketNameByJwcode(jwcode);
-                return Result.errorWithData("无权限访问", java.util.Map.of("market", userMarketName));
+                String translatedMarketName = languageTranslationUtil.translate(userMarketName, lang);
+                String message = languageTranslationUtil.translate("无权限访问", lang);
+                return Result.errorWithData(message, java.util.Map.of("market", translatedMarketName));
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("精网号有误！请检查");
+            String errorMessage = languageTranslationUtil.translate("精网号有误！请检查", lang);
+            return Result.error(errorMessage);
         }
     }