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 94c8f5a..66f1b30 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 @@ -236,7 +236,7 @@ public class CashRecordDTO{ * 退款金额 */ @ExcelIgnore - private String refundAmount; + private BigDecimal refundAmount; /** * 关联收款id diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index b4ec7a4..dff25d6 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -337,7 +337,7 @@ crc.num_unit, crr.refund_model, r.rate_name as refund_currency, - crr.refund_amount, + ROUND(crr.refund_amount / 100.0, 2) as refundAmount, crr.refund_channels, crr.refund_voucher, crr.refund_time, @@ -550,7 +550,7 @@ NULL as payment_currency, NULL as paymentAmount, crc.received_currency as received_currency, - ROUND(crc.received_amount / 100.0, 2) as receivedAmount, + ROUND(-crr.refund_amount / 100.0, 2) as receivedAmount, NULL as handlingCharge, NULL as permanentGold, NULL as freeGold,