Browse Source

1.21 修改消耗查询

huangqizheng/feature-20260113143035-现金管理0109
huangqizhen 1 month ago
parent
commit
437e20b1d8
  1. 2
      src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java
  2. 2
      src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
  3. 3
      src/main/resources/mapper/ConsumeMapper.xml

2
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)) {

2
src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java

@ -76,7 +76,7 @@ public class ConsumeUser implements Serializable {
private List<String> markets; // 地区列表
@ExcelIgnore
private Integer flag; //是否为员工号
private BigDecimal price; // 折扣金币
private BigDecimal price; // 原价
@ExcelIgnore
private Integer redMoney; //是否用红包
@ExcelIgnore

3
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

Loading…
Cancel
Save