From 92bc016575b12fa66b7b7ab9f896b9d2eb411cba Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 25 Jan 2026 13:54:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1=E6=9C=8825=E6=97=A5=EF=BC=8C=E5=8F=8D?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashCollectionController.java | 18 ++++++++++++++++++ .../demo/controller/cash/CashRefundController.java | 14 ++++++++++++++ 2 files changed, 32 insertions(+) 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 7984bea..dbd484f 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -351,6 +351,10 @@ public class CashCollectionController { if (collection.getPaymentCurrency() != null) { collection.setPaymentCurrency(languageTranslationUtil.translate(collection.getPaymentCurrency(), lang)); } + // 翻译数量单位 + if (collection.getNumUnit() != null) { + collection.setNumUnit(languageTranslationUtil.translate(collection.getNumUnit(), lang)); + } } } @@ -436,6 +440,13 @@ public class CashCollectionController { cashCollection.getMarketName(), languageCode); cashCollection.setMarketName(chineseMarketName); } + + // 转换数量单位 + if (cashCollection.getNumUnit() != null && !cashCollection.getNumUnit().isEmpty()) { + String chineseNumUnit = translationService.findChineseSimplifiedByTranslation( + cashCollection.getNumUnit(), languageCode); + cashCollection.setNumUnit(chineseNumUnit); + } } } @@ -513,6 +524,13 @@ public class CashCollectionController { cashCollection.getMarketName(), languageCode); cashCollection.setMarketName(chineseMarketName); } + + // 转换数量单位 + if (cashCollection.getNumUnit() != null && !cashCollection.getNumUnit().isEmpty()) { + String chineseNumUnit = translationService.findChineseSimplifiedByTranslation( + cashCollection.getNumUnit(), languageCode); + cashCollection.setNumUnit(chineseNumUnit); + } } } diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java index 70ca611..ec62d0b 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -675,6 +675,20 @@ public class CashRefundController { cashRecordRefund.getRefundCurrency(), languageCode); cashRecordRefund.setRefundCurrency(chineseCurrency); } + + // 转换所属地区 + if (cashRecordRefund.getMarketName() != null && !cashRecordRefund.getMarketName().isEmpty()) { + String chineseMarket = translationService.findChineseSimplifiedByTranslation( + cashRecordRefund.getMarketName(), languageCode); + cashRecordRefund.setMarketName(chineseMarket); + } + + // 转换提交人地区 + if (cashRecordRefund.getSubmitterMarket() != null && !cashRecordRefund.getSubmitterMarket().isEmpty()) { + String chineseMarket = translationService.findChineseSimplifiedByTranslation( + cashRecordRefund.getSubmitterMarket(), languageCode); + cashRecordRefund.setSubmitterMarket(chineseMarket); + } } } From f58808619046b2de90ede95a0bd3c08d48a8600d Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 25 Jan 2026 15:50:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1=E6=9C=8825=E6=97=A5=EF=BC=8C=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/Util/ExcelHeaderTranslator.java | 4 +++- .../com/example/demo/domain/vo/cash/CashRecordDTO.java | 14 ++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 699ec38..565eba1 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -292,6 +292,8 @@ public class ExcelHeaderTranslator { headers.put("goodsName", "产品名称"); headers.put("goodsNum", "产品数量"); headers.put("numUnit", "产品单位"); + headers.put("permanentGold", "永久金币数量"); + headers.put("freeGold", "免费金币数量"); headers.put("Submitter", "提交人"); headers.put("id", "序号"); headers.put("jwcode", "精网号"); @@ -315,7 +317,7 @@ public class ExcelHeaderTranslator { */ public List getCashRecordColumnOrder() { return Arrays.asList( - "goodsName", "goodsNum", "numUnit", "Submitter", "id", "jwcode", "name", "market", + "goodsName", "goodsNum", "numUnit", "permanentGold", "freeGold", "Submitter", "id", "jwcode", "name", "market", "status", "remark", "refundReason", "refundModelDesc" ); } diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index dc38b45..f56e414 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java @@ -31,6 +31,8 @@ public class CashRecordDTO{ private String goodsName;// 商品名称 private Integer goodsNum;// 商品数量 private String numUnit;// 商品单位 + private BigDecimal permanentGold;//永久金币 + private BigDecimal freeGold;// 免费金币 @ExcelIgnore private BigDecimal gold;//永久金币 @ExcelIgnore @@ -112,18 +114,6 @@ public class CashRecordDTO{ private String bankCode; /** - * 永久金币 - */ - @ExcelIgnore - private BigDecimal permanentGold; - - /** - * 免费金币 - */ - @ExcelIgnore - private BigDecimal freeGold; - - /** * 审核人id */ @ExcelIgnore From 29c778f5e98d9d8b1edf52a8a587675bd9301cf5 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 25 Jan 2026 16:23:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1=E6=9C=8825=E6=97=A5=EF=BC=8C=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E7=9A=84=E6=95=B0=E9=87=8F=E5=8D=95=E4=BD=8D=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/cash/CashRefundController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java index ec62d0b..f46367b 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -548,6 +548,10 @@ public class CashRefundController { String refundModelDesc = convertRefundModelToString(dto.getRefundModel()); dto.setRefundModelDesc(languageTranslationUtil.translate(refundModelDesc, lang)); } + // 翻译商品单位 + if (dto.getNumUnit() != null) { + dto.setNumUnit(languageTranslationUtil.translate(dto.getNumUnit(), lang)); + } } } } @@ -640,6 +644,13 @@ public class CashRefundController { cashRecordDTO.getPaymentCurrency(), languageCode); cashRecordDTO.setPaymentCurrency(chineseCurrency); } + + // 转换商品单位 + if (cashRecordDTO.getNumUnit() != null && !cashRecordDTO.getNumUnit().isEmpty()) { + String chineseNumUnit = translationService.findChineseSimplifiedByTranslation( + cashRecordDTO.getNumUnit(), languageCode); + cashRecordDTO.setNumUnit(chineseNumUnit); + } } } From 70c5cbdb59e3db9821e65d50d1248604b05b3c02 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sun, 25 Jan 2026 17:17:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.25=20=E4=BF=AE=E6=94=B9=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashRefundController.java | 2 +- .../example/demo/service/cash/RefundService.java | 1 + .../serviceImpl/cash/CashRefundServiceImpl.java | 82 +++++++++++++++++++++- .../serviceImpl/coin/ExportExcelServiceImpl.java | 33 +++++++++ 4 files changed, 116 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java index f46367b..1656b36 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -381,7 +381,7 @@ public class CashRefundController { return Result.error(errorMsg); } - Result result = Result.success(refundService.financeSelect(page.getPageNum(), page.getPageSize(), page.getCashRecordDTO())); + Result result = Result.success(refundService.financeSelect2(page.getPageNum(), page.getPageSize(), page.getCashRecordDTO())); // 对返回结果进行多语言转换 if (result.getCode() == 200 && result.getData() instanceof com.github.pagehelper.PageInfo) { diff --git a/src/main/java/com/example/demo/service/cash/RefundService.java b/src/main/java/com/example/demo/service/cash/RefundService.java index 608f32c..8baa23c 100644 --- a/src/main/java/com/example/demo/service/cash/RefundService.java +++ b/src/main/java/com/example/demo/service/cash/RefundService.java @@ -32,6 +32,7 @@ public interface RefundService { int finalreview(CashRecordDone cashRecordDone, String lang); PageInfo financeSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO); + PageInfo financeSelect2(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO); PageInfo exSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO); //新增线上退款记录 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 3c1e6e8..628a8ae 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -361,7 +361,14 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); userGoldRecord.setType((byte) 2); userGoldRecord.setIsRefund((byte) 1); userGoldRecord.setRefundType("金币退款"); - userGoldRecord.setCrefundModel(cashRecordDone.getRefundModel()); + if (cashRecordDone.getRefundModel() == 1){ + userGoldRecord.setRefundModel(Byte.valueOf("1")); + } + else if (cashRecordDone.getRefundModel() == 0){ + userGoldRecord.setRefundModel(Byte.valueOf("0")); + } + + userGoldRecord.setJwcode(cashRecordDone.getJwcode()); userGoldRecord.setSumGold(cashRecordDone.getPermanentGold()+cashRecordDone.getFreeGold()); userGoldRecord.setPermanentGold(cashRecordDone.getPermanentGold()); @@ -418,6 +425,79 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); @Override public PageInfo financeSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { + List markets = marketMapper.getMarketIds(cashRecordDTO.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } + cashRecordDTO.setMarkets(markets); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper +// System.out.println(goldDetail.getMarkets()); + List list = cashRefundMapper.financeSelect(cashRecordDTO); + if (list.isEmpty()) { + return new PageInfo<>(list); + } + + // 批量收集ID + Set relatedIds = new HashSet<>(); + Set marketIds = new HashSet<>(); + Set submitterIds = new HashSet<>(); + Set auditIds = new HashSet<>(); + Set executorIds = new HashSet<>(); + + list.forEach(item -> { + if (item.getRelatedId() != null) relatedIds.add(item.getRelatedId()); + if (item.getMarket() != null) marketIds.add(item.getMarket()); + if (item.getSubmitterId() != null) submitterIds.add(item.getSubmitterId()); + if (item.getAuditId() != null) auditIds.add(item.getAuditId()); + if (item.getExecutor() != null) executorIds.add(item.getExecutor()); + }); + + // 批量查询 + Map cashCollectionMap = cashCollectionMapper.selectBatchIds(relatedIds) + .stream().collect(Collectors.toMap(CashCollection::getId, Function.identity())); + + Map marketNameMap = marketMapper.getMarketByIds(marketIds) + .stream().collect(Collectors.toMap(Market::getId, Market::getName)); + + Map submitterNameMap = auditMapper.getNamesByIds(submitterIds) + .stream().collect(Collectors.toMap(Admin::getId, Admin::getAdminName)); + + Map auditMap = cashRefundMapper.getAuditBatch(auditIds) + .stream().collect(Collectors.toMap(LhlAudit::getId, Function.identity())); + Map executorNameMap = auditMapper.getNamesByJwcodes(executorIds) + .stream().collect(Collectors.toMap(Admin::getAccount, Admin::getAdminName)); + + // 处理数据 + list.forEach(item -> { + CashCollection cashCollection = cashCollectionMap.get(item.getRelatedId()); + if (cashCollection != null) { + processCashCollection(item, cashCollection); + } + + + String marketName = marketNameMap.get(item.getMarket()); + String submitter = submitterNameMap.get(item.getSubmitterId()); + LhlAudit lhlAudit = auditMap.get(item.getAuditId()); + String executorName = executorNameMap.get(String.valueOf(item.getExecutor())); + + item.setMarketName(marketName != null ? marketName : ""); + item.setSubmitter(submitter != null ? submitter : ""); + item.setExecutorName(executorName != null ? executorName : ""); + + if (lhlAudit != null) { + item.setAreaServise(lhlAudit.getAreaServise()); + item.setAreaFinance(lhlAudit.getAreaFinance()); + item.setAreaCharge(lhlAudit.getAreaCharge()); + item.setHeadFinance(lhlAudit.getHeadFinance()); + } + }); + + return new PageInfo<>(list); + } + + @Override + public PageInfo financeSelect2(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { + List markets = marketMapper.getMarketIds(cashRecordDTO.getMarkets()); PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper // System.out.println(goldDetail.getMarkets()); List list = cashRefundMapper.financeSelect(cashRecordDTO); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index 734daed..dd4344a 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -29,7 +29,9 @@ import com.example.demo.domain.vo.cash.PerformanceVO; import com.example.demo.domain.vo.coin.*; import com.example.demo.mapper.coin.ExportMapper; +import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.service.coin.ExportExcelService; +import com.example.demo.service.coin.MarketService; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -43,6 +45,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.io.*; import java.util.*; @@ -88,6 +91,8 @@ public class ExportExcelServiceImpl implements ExportExcelService { private static final int PAGE_SIZE = 5000; @Autowired private ExportMapper exportMapper; + @Autowired + private MarketService marketService; @Transactional @Override @@ -352,8 +357,36 @@ public class ExportExcelServiceImpl implements ExportExcelService { JsonNode rootNode = objectMapper.readTree(message); JsonNode requestDataNode = rootNode.path("requestData"); JsonNode beanRechargeNode = requestDataNode.path("cashRecordDTO"); + String token = rootNode.path("token").asText(); CashRecordDTO cashRecordDTO = objectMapper.treeToValue(beanRechargeNode, CashRecordDTO.class); page.setCashRecordDTO(cashRecordDTO); + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + List userMarkets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); + List markets = marketService.getMarketIds(userMarkets); + + + // 获取传入的市场列表 + List requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null; + + // 权限校验逻辑 + if (markets.contains("9") || markets.contains("9999")) { + // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets + // 如果业务需要，也可以在这里做空值处理 + if (page.getCashRecordDTO() != null) { + // 保持 requestedMarkets 不变，原样接受 + // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null + } + } else { + // 普通用户：必须校验权限 + if (requestedMarkets == null || requestedMarkets.isEmpty()) { + page.getCashRecordDTO().setMarkets(markets); + } + if (!markets.containsAll(requestedMarkets)) { + String errorMsg = "无权限！请求的市场不在授权范围内。"; + return Result.error(errorMsg); + } + // 校验通过，保持 requestedMarkets 不变 + } // 从请求数据中获取语言设置，如果没有则使用默认值 String lang = "zh_CN"; JsonNode langNode = requestDataNode.path("lang"); From 00b49924be9fc8b310d3dce26563dad33461f0e2 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 25 Jan 2026 17:34:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1=E6=9C=8825=E6=97=A5=EF=BC=8C=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E5=AF=BC=E5=87=BA=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/Util/ExcelHeaderTranslator.java | 8 ++--- .../example/demo/domain/vo/cash/CashRecordDTO.java | 11 +++--- .../serviceImpl/coin/ExportExcelServiceImpl.java | 40 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 565eba1..d77697f 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -298,8 +298,8 @@ public class ExcelHeaderTranslator { headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); - headers.put("market", "所属地区"); - headers.put("status", "订单状态"); + headers.put("marketName", "所属地区"); + headers.put("statusDesc", "订单状态"); headers.put("remark", "备注"); headers.put("refundReason", "退款理由"); headers.put("refundModelDesc", "退款方式"); @@ -317,8 +317,8 @@ public class ExcelHeaderTranslator { */ public List getCashRecordColumnOrder() { return Arrays.asList( - "goodsName", "goodsNum", "numUnit", "permanentGold", "freeGold", "Submitter", "id", "jwcode", "name", "market", - "status", "remark", "refundReason", "refundModelDesc" + "goodsName", "goodsNum", "numUnit", "permanentGold", "freeGold", "Submitter", "id", "jwcode", "name", "marketName", + "statusDesc", "remark", "refundReason", "refundModelDesc" ); } diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index f56e414..94c8f5a 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java @@ -1,9 +1,6 @@ package com.example.demo.domain.vo.cash; import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.example.demo.config.MarketConverter; -import com.example.demo.config.OrderStatusConverter; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; @@ -98,8 +95,9 @@ public class CashRecordDTO{ /** * 所属地区 */ - @ExcelProperty(value = "",converter = MarketConverter.class) + @ExcelIgnore private Integer market; + private String marketName; /** * 金币订单号 @@ -131,8 +129,9 @@ public class CashRecordDTO{ 30：总部财务待审核；32：总部财务驳回； 40：执行人待处理；41：执行人已处理，退款结束 */ - @ExcelProperty(value="",converter = OrderStatusConverter.class) + @ExcelIgnore private Integer status; + private String statusDesc; /** * 提交人id @@ -257,8 +256,6 @@ public class CashRecordDTO{ @ExcelIgnore private String executorName; @ExcelIgnore - private String marketName; - @ExcelIgnore private List statuses; @ExcelIgnore private String processInstanceId; // 流程实例ID diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index dd4344a..18260f1 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -1337,6 +1337,34 @@ public class ExportExcelServiceImpl implements ExportExcelService { default: return "其他"; } } + + /** + * 根据状态值获取状态描述 + */ + private String getStatusDescription(Integer status) { + if (status == null) return ""; + + switch (status) { + case 0: return "线下财务待审核"; + case 1: return "线下财务审核通过待填手续费"; + case 2: return "线下财务审核驳回"; + case 3: return "link线上财务复核待填手续费"; + case 4: return "收款流程全部结束"; + case 5: return "手动撤回待编辑提交"; + case 6: return "退款"; + case 10: return "地区财务待审核"; + case 11: return "地区财务手动撤回待编辑提交"; + case 12: return "地区财务驳回"; + case 20: return "地区负责人待审核"; + case 22: return "地区负责人驳回"; + case 30: return "总部财务待审核"; + case 32: return "总部财务驳回"; + case 40: return "执行人待处理"; + case 41: return "执行人已处理，退款结束"; + default: return "未知状态（" + status + "）"; + } + } + // 各种实体类的翻译方法 /** @@ -1636,6 +1664,18 @@ public class ExportExcelServiceImpl implements ExportExcelService { if (item.getRefundModelDesc() != null && !item.getRefundModelDesc().isEmpty()) { item.setRefundModelDesc(languageTranslationUtil.translate(item.getRefundModelDesc(), lang)); } + + // 翻译所属地区名称 + if (item.getMarketName() != null && !item.getMarketName().isEmpty()) { + item.setMarketName(languageTranslationUtil.translate(item.getMarketName(), lang)); + } + + // 翻译订单状态（首先获取状态的中文描述，然后进行多语言翻译） + if (item.getStatus() != null) { + String statusDesc = getStatusDescription(item.getStatus()); + String translatedStatus = languageTranslationUtil.translate(statusDesc, lang); + item.setStatusDesc(translatedStatus); // 假设有状态描述字段 + } } } From 5fc21b82ddb219cac9bdc6e14dfb30ab5487e6c0 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 25 Jan 2026 17:46:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E6=9C=8825=E6=97=A5=EF=BC=8C=E8=B5=84?= =?UTF-8?q?=E9=87=91=E5=AF=BC=E5=87=BA=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index 18260f1..7cea853 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -928,7 +928,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { } // 添加资金流水翻译支持 - if ("fundsUser".equals(exportType) && list.get(0) instanceof FundsDTO) { + if ("fundUser".equals(exportType) && list.get(0) instanceof FundsDTO) { fillUserStatusDescriptions((List) list); translateFundsList((List) list, lang); } @@ -1674,7 +1674,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { if (item.getStatus() != null) { String statusDesc = getStatusDescription(item.getStatus()); String translatedStatus = languageTranslationUtil.translate(statusDesc, lang); - item.setStatusDesc(translatedStatus); // 假设有状态描述字段 + item.setStatusDesc(translatedStatus); } } }