diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 8fc206e..403219c 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -78,12 +78,12 @@ public class ExcelHeaderTranslator { headers.put("permanentGold", "永久金币"); headers.put("freeGold", "免费金币"); headers.put("taskGold", "任务金币"); + headers.put("remark", "备注"); headers.put("refundSumGold", "退款金币总数"); headers.put("refundPermanentGold", "退款永久金币"); headers.put("refundFreeGold", "退款免费金币"); headers.put("refundTaskGold", "退款任务金币"); - headers.put("refundModel", "退款类型"); - headers.put("remark", "备注"); + headers.put("refundModelDesc", "退款类型"); headers.put("adminName", "提交人"); headers.put("isRefund", "是否退款"); headers.put("createTime", "消耗时间"); @@ -104,9 +104,9 @@ public class ExcelHeaderTranslator { return Arrays.asList( "name", "orderCode", "jwcode", "market", "goodsName", "payPlatform", "sumGold", "permanentGold", "freeGold", - "taskGold", "refundSumGold", "refundPermanentGold", - "refundFreeGold", "refundTaskGold", "refundModel", - "remark", "adminName", "isRefund", "createTime", "price" + "taskGold","remark", "refundSumGold", "refundPermanentGold", + "refundFreeGold", "refundTaskGold", "refundModelDesc", + "adminName", "isRefund", "createTime", "price" ); } diff --git a/src/main/java/com/example/demo/controller/coin/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java index 0b30c10..77bf693 100644 --- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java @@ -263,9 +263,15 @@ public class ConsumeController { if (user.getGoodsName() != null) { user.setGoodsName(languageTranslationUtil.translate(user.getGoodsName(), lang)); } + // 翻译退款类型描述 + if (user.getRefundModel() != null) { + String refundModelDesc = convertRefundModelToString(user.getRefundModel()); + user.setRefundModelDesc(languageTranslationUtil.translate(refundModelDesc, lang)); + } } } } + /** * 解析语言代码 */ @@ -305,4 +311,16 @@ public class ConsumeController { } } } + + /** + * 将退款类型数字转换为中文描述 + */ + private String convertRefundModelToString(Byte refundModel) { + if (refundModel == null) return ""; + switch (refundModel) { + case 0: return "全部退款"; + case 1: return "部分退款"; + default: return "未知退款"; + } + } } 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 4840303..91eb500 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 @@ -47,7 +47,9 @@ public class ConsumeUser implements Serializable { private BigDecimal refundPermanentGold;// 退款永久金币 private BigDecimal refundFreeGold;// 退款免费金币 private BigDecimal refundTaskGold;// 退款任务金币 - private String refundModel;// 退款类型 0全部退款 1部分退款 + @ExcelIgnore + private Byte refundModel;// 退款类型 0全部退款 1部分退款 + private String refundModelDesc;// 退款类型描述 @ExcelIgnore private Integer adminId; //提交人Id private String adminName; //提交人姓名