From 437e20b1d81d350fc8040ff2cf1db203b7de0b44 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Wed, 21 Jan 2026 14:24:09 +0800 Subject: [PATCH] =?UTF-8?q?1.21=20=E4=BF=AE=E6=94=B9=E6=B6=88=E8=80=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java | 2 +- src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java | 2 +- src/main/resources/mapper/ConsumeMapper.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 2c0feca..abb0af8 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -87,7 +87,7 @@ public class ExcelHeaderTranslator { headers.put("adminName", "提交人"); headers.put("isRefundDescription", "是否退款"); headers.put("createTime", "消耗时间"); - headers.put("price", "折扣金币"); + headers.put("price", "原价"); // 如果需要翻译，则翻译表头 if (!isChineseLanguage(lang)) { diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index 0f59c51..1b8215a 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java @@ -76,7 +76,7 @@ public class ConsumeUser implements Serializable { private List markets; // 地区列表 @ExcelIgnore private Integer flag; //是否为员工号 - private BigDecimal price; // 折扣金币 + private BigDecimal price; // 原价 @ExcelIgnore private Integer redMoney; //是否用红包 @ExcelIgnore diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 26f697e..180dbed 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -87,7 +87,8 @@ ugr.remark AS remark, a.admin_name AS adminName, ugr.create_time AS createTime, - ugr.is_refund AS isRefund + ugr.is_refund AS isRefund, + ugr.price AS price FROM user_gold_record ugr left JOIN user u ON u.jwcode = ugr.jwcode