Browse Source

Merge remote-tracking branch 'origin/milestone-20260401-现金管理四期' into milestone-20260401-现金管理四期

dev
wangguorui 6 days ago
parent
commit
93ad645605
  1. 2
      src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java
  2. 4
      src/main/resources/cashMapper/CashRefundMapper.xml

2
src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java

@ -236,7 +236,7 @@ public class CashRecordDTO{
* 退款金额 * 退款金额
*/ */
@ExcelIgnore @ExcelIgnore
private String refundAmount;
private BigDecimal refundAmount;
/** /**
* 关联收款id * 关联收款id

4
src/main/resources/cashMapper/CashRefundMapper.xml

@ -337,7 +337,7 @@
crc.num_unit, crc.num_unit,
crr.refund_model, crr.refund_model,
r.rate_name as refund_currency, r.rate_name as refund_currency,
crr.refund_amount,
ROUND(crr.refund_amount / 100.0, 2) as refundAmount,
crr.refund_channels, crr.refund_channels,
crr.refund_voucher, crr.refund_voucher,
crr.refund_time, crr.refund_time,
@ -550,7 +550,7 @@
NULL as payment_currency, NULL as payment_currency,
NULL as paymentAmount, NULL as paymentAmount,
crc.received_currency as received_currency, 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 handlingCharge,
NULL as permanentGold, NULL as permanentGold,
NULL as freeGold, NULL as freeGold,

Loading…
Cancel
Save