From af2cb0f305daadf66ced640c6d273f82957dd896 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Wed, 21 Jan 2026 15:15:51 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8821=E6=97=A5.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java | 4 +--- .../com/example/demo/controller/cash/CashCollectionController.java | 4 +--- src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java | 2 -- .../com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java | 2 +- src/main/resources/cashMapper/CashCollectionMapper.xml | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index abb0af8..4aacd07 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -131,8 +131,6 @@ public class ExcelHeaderTranslator { headers.put("taskGold", "任务金币"); headers.put("remark", "备注"); headers.put("adminName", "提交人"); - headers.put("price", "原价"); - headers.put("linkId", "LinkId"); headers.put("auditTime", "退款时间"); // 如果需要翻译，则翻译表头 @@ -150,7 +148,7 @@ public class ExcelHeaderTranslator { return Arrays.asList( "orderCode", "name", "jwcode", "market", "goodsName", "refundType", "refundModelDesc", "sumGold", "permanentGold", - "freeGold", "taskGold", "remark", "adminName", "price", "linkId", "auditTime" + "freeGold", "taskGold", "remark", "adminName", "auditTime" ); } 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 1cdfab4..c96ec8c 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -296,10 +296,8 @@ public class CashCollectionController { return result; } catch (Exception e) { - // 推送异常到飞书（核心：调用工具类） - System.out.println(e.getMessage()); String errorMsg = languageTranslationUtil.translate(e.getMessage(), lang); - throw new SecurityException(); + return Result.error(errorMsg); } } diff --git a/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java b/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java index adc8832..bbcf9de 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java @@ -33,7 +33,5 @@ public class PerformanceVO { private String receivedCurrency; // 到账币种 private BigDecimal receivedAmount; // 到账金额 private BigDecimal handlingCharge; // 手续费 - private String token; - private String lang; } 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 e1df3c7..c996ccc 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -1206,7 +1206,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { private String convertIsRefundToString(Integer isRefund) { if (isRefund == null) return ""; switch (isRefund) { - case 0: return "未退款"; + case 0: return "正常"; case 1: return "已退款"; default: return "未知状态"; } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index dbfdf6a..befed17 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -313,7 +313,7 @@ - +