diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 4aacd07..699ec38 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -300,7 +300,7 @@ public class ExcelHeaderTranslator { headers.put("status", "订单状态"); headers.put("remark", "备注"); headers.put("refundReason", "退款理由"); - headers.put("refundModel", "退款方式"); + headers.put("refundModelDesc", "退款方式"); // 如果需要翻译,则翻译表头 if (!isChineseLanguage(lang)) { @@ -316,7 +316,7 @@ public class ExcelHeaderTranslator { public List getCashRecordColumnOrder() { return Arrays.asList( "goodsName", "goodsNum", "numUnit", "Submitter", "id", "jwcode", "name", "market", - "status", "remark", "refundReason", "refundModel" + "status", "remark", "refundReason", "refundModelDesc" ); } diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java index d3d956a..70ca611 100644 --- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java +++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java @@ -543,6 +543,11 @@ public class CashRefundController { if (dto.getReceivedCurrency() != null) { dto.setReceivedCurrency(languageTranslationUtil.translate(dto.getReceivedCurrency(), lang)); } + // 翻译退款方式 + if (dto.getRefundModel() != null) { + String refundModelDesc = convertRefundModelToString(dto.getRefundModel()); + dto.setRefundModelDesc(languageTranslationUtil.translate(refundModelDesc, lang)); + } } } } @@ -726,4 +731,15 @@ public class CashRefundController { } } + /** + * 将退款模型数字转换为中文描述 + */ + 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/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index c210608..dc38b45 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 @@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.example.demo.config.MarketConverter; import com.example.demo.config.OrderStatusConverter; -import com.example.demo.config.RefundModelConverter; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; @@ -182,8 +181,9 @@ public class CashRecordDTO{ /** * 退款方式(0全额/1部分) */ - @ExcelProperty(value = "",converter = RefundModelConverter.class) - private Integer refundModel; + @ExcelIgnore + private Byte refundModel; + private String refundModelDesc; //退款方式转换 /** * 退款执行人OA号 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 fddff0e..734daed 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -875,6 +875,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { // 添加财务退款翻译支持 if ("financeUser".equals(exportType) && list.get(0) instanceof CashRecordDTO) { + fillRechargeUserIsRefund((List) list); translateCashRecordDTOList((List) list, lang); } @@ -1133,6 +1134,20 @@ public class ExportExcelServiceImpl implements ExportExcelService { } /** + * 填充财务退款用户数据的退款方式描述 + */ + private void fillRechargeUserIsRefund(List cashRecords) { + if (cashRecords != null && !cashRecords.isEmpty()) { + for (CashRecordDTO cashRecord : cashRecords) { + if (cashRecord.getRefundModel() != null) { + String modelDesc = convertRefundModelToString(cashRecord.getRefundModel()); + cashRecord.setRefundModelDesc(modelDesc); + } + } + } + } + + /** * 填充退款用户数据的退款方式描述 */ private void fillRefundUserModelDescriptions(List refundUsers) { @@ -1583,6 +1598,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { if (item.getRefundRemark() != null && !item.getRefundRemark().isEmpty()) { item.setRefundRemark(languageTranslationUtil.translate(item.getRefundRemark(), lang)); } + + // 翻译退款方式 + if (item.getRefundModelDesc() != null && !item.getRefundModelDesc().isEmpty()) { + item.setRefundModelDesc(languageTranslationUtil.translate(item.getRefundModelDesc(), lang)); + } } }