From c32a3ef4e9ea601a44f6af29945dced714db9e13 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 13 Aug 2025 18:54:35 +0800 Subject: [PATCH] =?UTF-8?q?8-13=E5=AE=A1=E6=A0=B8=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=81=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java | 6 ++++++ src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java | 5 +++++ src/main/resources/mapper/AuditMapper.xml | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java index 30e3726..ec44294 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java @@ -1,5 +1,6 @@ package com.example.demo.domain.vo.coin; +import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; @@ -33,6 +34,11 @@ public class RechargeAudit { private List markets; // 所属地区 private String refundType; // 退款类型 private Byte refundModel; // 退款类型 + private Integer rateId; // 汇率ID + + private String rateName; // 汇率名称 + + private Integer money; // 金额[分] private Integer sumGold; //充值金额 private Integer permanentGold; // 永久金币 private Integer freeGold; // 免费金币 diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java index a8e090c..035f6c9 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java @@ -31,6 +31,11 @@ public class RefundAudit { private List markets; // 所属地区 private Integer refundModel; // 退款方式-全额 部分 private String goodsName; // 商品名称 + private Integer rateId; // 汇率ID + + private String rateName; // 汇率名称 + + private Integer money; // 金额[分] private Integer sumGold; // 退款金额 private Integer permanentGold; // 永久金币 private Integer freeGold; // 免费金币 diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 3e9badf..7edf30e 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -48,6 +48,7 @@ (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold, u.name as name, m.name as market, + r.rate_name AS rateName, a1.admin_name as adminName, a2.admin_name as auditName FROM user_gold_record as ugr @@ -55,6 +56,7 @@ LEFT JOIN admin a1 ON ugr.admin_id = a1.id LEFT JOIN admin a2 ON ugr.audit_id = a2.id left join market m ON u.market = m.id + left JOIN rate r ON ugr.rate_id = r.id AND ugr.jwcode = #{rechargeAudit.jwcode} @@ -80,7 +82,7 @@ AND m.name = #{rechargeAudit.market} - AND ugr.pay_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime} + AND ugr.audit_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime} @@ -103,6 +105,7 @@ SELECT ugr.*, (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold, u.name as name, + r.rate_name AS rateName, m.name as market, a1.admin_name as adminName, a2.admin_name as auditName @@ -111,6 +114,7 @@ LEFT JOIN admin a1 ON ugr.admin_id = a1.id LEFT JOIN admin a2 ON ugr.audit_id = a2.id left join market m ON u.market = m.id + left JOIN rate r ON ugr.rate_id = r.id @@ -132,7 +136,7 @@ ) - AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime} + AND ugr.audit_time between #{refundAudit.startTime} and #{refundAudit.endTime} AND m.name = #{refundAudit.market}