20260411 业绩归属、资金流水翻译优化

src/main/java/com/example/demo/controller/cash/CashCollectionController.java

@@ -639,6 +639,22 @@ public class CashCollectionController {
             if (performance.getReceivedCurrency() != null) {
                 performance.setReceivedCurrency(languageTranslationUtil.translate(performance.getReceivedCurrency(), lang));
             }
+            // 翻译支付方式
+            if (performance.getPayType() != null) {
+                performance.setPayType(languageTranslationUtil.translate(performance.getPayType(), lang));
+            }
+            // 翻译收款地区名称
+            if (performance.getReceivedMarketName() != null) {
+                performance.setReceivedMarketName(languageTranslationUtil.translate(performance.getReceivedMarketName(), lang));
+            }
+            // 翻译到账地区名称
+            if (performance.getPerformanceMarketName() != null) {
+                performance.setPerformanceMarketName(languageTranslationUtil.translate(performance.getPerformanceMarketName(), lang));
+            }
+            // 翻译商品名称
+            if (performance.getGoodsName() != null) {
+                performance.setGoodsName(languageTranslationUtil.translate(performance.getGoodsName(), lang));
+            }
         }
     }
 
@@ -833,6 +849,34 @@ public class CashCollectionController {
                         performanceVO.getReceivedCurrency(), languageCode);
                 performanceVO.setReceivedCurrency(chineseReceivedCurrency);
             }
+
+            // 转换到账地区名称
+            if (performanceVO.getReceivedMarketName() != null && !performanceVO.getReceivedMarketName().isEmpty()) {
+                String chineseReceivedMarketName = translationService.findChineseSimplifiedByTranslation(
+                        performanceVO.getReceivedMarketName(), languageCode);
+                performanceVO.setReceivedMarketName(chineseReceivedMarketName);
+            }
+
+            // 转换收款地区名称
+            if (performanceVO.getPerformanceMarketName() != null && !performanceVO.getPerformanceMarketName().isEmpty()) {
+                String chinesePerformanceMarketName = translationService.findChineseSimplifiedByTranslation(
+                        performanceVO.getPerformanceMarketName(), languageCode);
+                performanceVO.setPerformanceMarketName(chinesePerformanceMarketName);
+            }
+
+            // 转换商品名称
+            if (performanceVO.getGoodsName() != null && !performanceVO.getGoodsName().isEmpty()) {
+                String chineseGoodsName = translationService.findChineseSimplifiedByTranslation(
+                        performanceVO.getGoodsName(), languageCode);
+                performanceVO.setGoodsName(chineseGoodsName);
+            }
+
+            // 转换支付方式
+            if (performanceVO.getPayType() != null && !performanceVO.getPayType().isEmpty()) {
+                String chinesePayType = translationService.findChineseSimplifiedByTranslation(
+                        performanceVO.getPayType(), languageCode);
+                performanceVO.setPayType(chinesePayType);
+            }
         }
     }
 

src/main/java/com/example/demo/controller/cash/CashRefundController.java

@@ -683,6 +683,18 @@ public class CashRefundController {
                 String statusName = convertStatusToString(funds.getStatus());
                 funds.setStatusName(languageTranslationUtil.translate(statusName, lang));
             }
+            // 翻译商品名称
+            if (funds.getGoodsName() != null) {
+                funds.setGoodsName(languageTranslationUtil.translate(funds.getGoodsName(), lang));
+            }
+            // 翻译到账地区
+            if (funds.getReceivedMarket() != null) {
+                funds.setReceivedMarket(languageTranslationUtil.translate(funds.getReceivedMarket(), lang));
+            }
+            // 翻译业绩归属地区
+            if (funds.getPerformanceMarket() != null) {
+                funds.setPerformanceMarket(languageTranslationUtil.translate(funds.getPerformanceMarket(), lang));
+            }
         }
     }
 
@@ -844,6 +856,27 @@ public class CashRefundController {
                         fundsDTO.getPayType(), languageCode);
                 fundsDTO.setPayType(chinesePayType);
             }
+
+            // 转换商品名称
+            if (fundsDTO.getGoodsName() != null && !fundsDTO.getGoodsName().isEmpty()) {
+                String chineseGoodsName = translationService.findChineseSimplifiedByTranslation(
+                        fundsDTO.getGoodsName(), languageCode);
+                fundsDTO.setGoodsName(chineseGoodsName);
+            }
+
+            // 转换到账地区
+            if (fundsDTO.getReceivedMarket() != null && !fundsDTO.getReceivedMarket().isEmpty()) {
+                String chineseMarket = translationService.findChineseSimplifiedByTranslation(
+                        fundsDTO.getReceivedMarket(), languageCode);
+                fundsDTO.setReceivedMarket(chineseMarket);
+            }
+
+            // 转换业绩归属地区
+            if (fundsDTO.getPerformanceMarket() != null && !fundsDTO.getPerformanceMarket().isEmpty()) {
+                String chineseMarket = translationService.findChineseSimplifiedByTranslation(
+                        fundsDTO.getPerformanceMarket(), languageCode);
+                fundsDTO.setPerformanceMarket(chineseMarket);
+            }
         }
     }
 

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -456,8 +456,8 @@
         crc.goods_name,
         crc.remark,
         crc.good_num,
-        crc.performance_market,
-        crc.received_market,
+        m1.name AS performanceMarket,
+        m2.name AS receivedMarket,
         crc.name,
         crc.market,
         crc.order_code,
@@ -479,6 +479,8 @@
         0 as isRefundRow
         FROM cash_record_collection crc
         left join recharge_activity ra on ra.id = crc.activity
+        LEFT JOIN market m1 ON m1.id = crc.performance_market
+        LEFT JOIN market m2 ON m2.id = crc.received_market
         WHERE 1=1
         <if test="jwcode != null">
             and crc.jwcode = #{jwcode}
@@ -540,8 +542,8 @@
         crc.goods_name,
         crc.remark,
         crc.good_num,
-        crc.performance_market,
-        crc.received_market,
+        m1.name AS performanceMarket,
+        m2.name AS receivedMarket,
         crc.name,
         crc.market,
         CONCAT('TK', crc.order_code) as order_code,
@@ -564,6 +566,8 @@
         FROM cash_record_refund crr
         INNER JOIN cash_record_collection crc ON crr.related_id = crc.id
         left join recharge_activity ra on ra.id = crc.activity
+        LEFT JOIN market m1 ON m1.id = crc.performance_market
+        LEFT JOIN market m2 ON m2.id = crc.received_market
         WHERE crr.status =41
         <if test="jwcode != null">
             and crc.jwcode = #{jwcode}