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