1.18 资金流水映射地区

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

@@ -572,8 +572,8 @@ public class CashRefundController {
                 funds.setPaymentCurrencyName(languageTranslationUtil.translate(funds.getPaymentCurrencyName(), lang));
             }
             // 翻译到账币种
-            if (funds.getReceivedCurrency() != null) {
-                funds.setReceivedCurrency(languageTranslationUtil.translate(funds.getReceivedCurrency(), lang));
+            if (funds.getReceivedCurrencyName() != null) {
+                funds.setReceivedCurrencyName(languageTranslationUtil.translate(funds.getReceivedCurrencyName(), lang));
             }
             // 翻译退款币种
             if (funds.getRefundCurrency() != null) {
@@ -693,10 +693,10 @@ public class CashRefundController {
             }
 
             // 转换到账币种
-            if (fundsDTO.getReceivedCurrency() != null && !fundsDTO.getReceivedCurrency().isEmpty()) {
+            if (fundsDTO.getReceivedCurrencyName() != null && !fundsDTO.getReceivedCurrencyName().isEmpty()) {
                 String chineseReceivedCurrency = translationService.findChineseSimplifiedByTranslation(
-                        fundsDTO.getReceivedCurrency(), languageCode);
-                fundsDTO.setReceivedCurrency(chineseReceivedCurrency);
+                        fundsDTO.getReceivedCurrencyName(), languageCode);
+                fundsDTO.setReceivedCurrencyName(chineseReceivedCurrency);
             }
 
             // 转换退款币种

src/main/java/com/example/demo/controller/coin/ExportController.java

@@ -830,10 +830,10 @@ public class ExportController {
                     fundsDTO.setPaymentCurrencyName(chinesePaymentCurrency);
                 }
                 // 翻译到账币种
-                if (fundsDTO.getReceivedCurrency() != null && !fundsDTO.getReceivedCurrency().isEmpty()) {
+                if (fundsDTO.getReceivedCurrencyName() != null && !fundsDTO.getReceivedCurrencyName().isEmpty()) {
                     String chineseReceivedCurrency = translationService.findChineseSimplifiedByTranslation(
-                            fundsDTO.getReceivedCurrency(), languageCode);
-                    fundsDTO.setReceivedCurrency(chineseReceivedCurrency);
+                            fundsDTO.getReceivedCurrencyName(), languageCode);
+                    fundsDTO.setReceivedCurrencyName(chineseReceivedCurrency);
                 }
             }
     }

src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java

@@ -36,7 +36,7 @@ public class FundsDTO {
     private String paymentCurrencyName;
     private BigDecimal paymentAmount;
     @ExcelIgnore
-    private String receivedCurrency;
+    private Integer receivedCurrency;
     private String receivedCurrencyName;
     private BigDecimal receivedAmount;
     private BigDecimal handlingCharge;

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -629,6 +629,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
         // 4. 收集所有需要转换的 regionId 和 currencyId
         Set<Integer> regionIds = new HashSet<>();
         Set<Integer> currencyIds = new HashSet<>();
+        Set<Integer> reCurrencyIds = new HashSet<>();
         for (FundsDTO dto : list) {
             if (dto.getMarket() != null) {
                 regionIds.add(dto.getMarket());
@@ -636,6 +637,9 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             if (dto.getPaymentCurrency() != null) {
                 currencyIds.add(dto.getPaymentCurrency());
             }
+            if (dto.getReceivedCurrency() != null) {
+                reCurrencyIds.add(dto.getReceivedCurrency());
+            }
         }
 
         // 5. 批量查询地区字典
@@ -655,12 +659,19 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
                 currencyMap.put(currency.getId(), currency.getName()); // 或 getCode()，按需调整
             }
         }
+        Map<Integer, String> reCurrencyMap = new HashMap<>();
+        if (!reCurrencyIds.isEmpty()) {
+            List<Currency> reCurrencies = refundMapper.selectByCIds(new ArrayList<>(reCurrencyIds));
+            for (Currency reCurrency : reCurrencies) {
+                reCurrencyMap.put(reCurrency.getId(), reCurrency.getName()); // 或 getCode()，按需调整
+            }
+        }
 
         // 7. 回填地区名称和币种名称到 DTO
         for (FundsDTO dto : list) {
             dto.setMarketName(regionMap.get(dto.getMarket()));
             dto.setPaymentCurrencyName(currencyMap.get(dto.getPaymentCurrency()));
-            dto.setReceivedCurrencyName(currencyMap.get(dto.getReceivedCurrency()));
+            dto.setReceivedCurrencyName(reCurrencyMap.get(dto.getReceivedCurrency()));
         }
 
         // 8. 返回分页结果