From 7b44a12a10f74745e644aa2e8af60e4674011d32 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 8 Apr 2026 16:50:35 +0800 Subject: [PATCH] =?UTF-8?q?04-08=20=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java | 5 +++++ src/main/resources/cashMapper/CashRefundMapper.xml | 8 ++++++++ 2 files changed, 13 insertions(+) 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 8d6fde0..79c5b34 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 @@ -30,11 +30,13 @@ public class FundsDTO { private String orderCode; private String receivedMarket; //到账地区 private String performanceMarket; //业绩归属地区 + private String activityName; //活动名称 private String name; private Integer jwcode; private String remark; //备注 private Integer goodNum; //商品数量 private String goodsName; + private String voucher; //转账凭证 private String payType; // 地区+支付方式组合列表 @ExcelIgnore @@ -44,6 +46,9 @@ public class FundsDTO { private BigDecimal paymentAmount; private BigDecimal handlingCharge; private BigDecimal receivedAmount; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date receivedTime; + @ExcelIgnore private Integer market; private String marketName; diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index daa938f..ce9a30f 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -452,6 +452,7 @@ SELECT crc.id, crc.jwcode, + ra.activity_name, crc.goods_name, crc.remark, crc.good_num, @@ -469,12 +470,15 @@ ROUND(crc.free_gold / 100.0, 2) as freeGold, crc.pay_type, crc.pay_time, + crc.received_time, + crc.voucher, crc.status, NULL as refundCurrency, NULL as refundAmount, NULL as relatedId, 0 as isRefundRow FROM cash_record_collection crc + left join recharge_activity ra on ra.id = crc.activity WHERE 1=1 and crc.jwcode = #{jwcode} @@ -522,6 +526,7 @@ SELECT crc.id, crc.jwcode, + ra.activity_name, crc.goods_name, crc.remark, crc.good_num, @@ -540,12 +545,15 @@ crc.pay_type, crr.refund_time as pay_time, crc.status, + crc.received_time, + crc.voucher, crr.refund_currency as refundCurrency, ROUND(crr.refund_amount / 100.0, 2) as refundAmount, crr.related_id as relatedId, 1 as isRefundRow FROM cash_record_refund crr INNER JOIN cash_record_collection crc ON crr.related_id = crc.id + left join recharge_activity ra on ra.id = crc.activity WHERE crc.status =6 and crr.status =41 and crc.jwcode = #{jwcode}