diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java index 82ec9de..fa51be4 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -45,4 +45,7 @@ public class FundsDTO { @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date endTime; + private String refundCurrency; + private BigDecimal refundAmount; + private Integer relatedId; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index e5f3dc6..8f295d9 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -606,7 +606,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); // 4. 构建 HashMap: id -> RefundDetailDTO Map detailMap = new HashMap<>(); for (FundsDTO detail : detailList) { - detailMap.put(detail.getId(), detail); // 假设 detail 有 getId() + detailMap.put(detail.getRelatedId(), detail); // 假设 detail 有 getId() } // 5. 回填到账金额和到账币种 @@ -615,14 +615,14 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); FundsDTO detail = detailMap.get(dto.getId()); if (detail != null) { // 将到账金额转为负数(正数 → 负数) - BigDecimal amount = detail.getReceivedAmount(); + BigDecimal amount = detail.getRefundAmount(); if (amount != null) { - dto.setReceivedAmount(amount.negate()); // 👈 关键:取负数 + dto.setRefundAmount(amount.negate()); // 👈 关键:取负数 } else { - dto.setReceivedAmount(null); // 或设为 BigDecimal.ZERO,根据业务需求 + dto.setRefundAmount(null); // 或设为 BigDecimal.ZERO,根据业务需求 } // 币种保持不变 - dto.setReceivedCurrency(detail.getReceivedCurrency()); + dto.setRefundCurrency(detail.getRefundCurrency()); } } } diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index ba66276..a30047f 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -458,8 +458,8 @@