8-13审核金额添加、审核时间筛选修复

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<String> 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; // 免费金币

src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java

@@ -31,6 +31,11 @@ public class RefundAudit {
     private List<String> 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; // 免费金币

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
         <where>
             <if test="rechargeAudit.jwcode != null and rechargeAudit.jwcode != ''">
                 AND ugr.jwcode = #{rechargeAudit.jwcode}
@@ -80,7 +82,7 @@
                 AND  m.name = #{rechargeAudit.market}
             </if>
             <if test="rechargeAudit.startTime != null and rechargeAudit.endTime != null ">
-                AND ugr.pay_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime}
+                AND ugr.audit_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime}
             </if>
 
             <if test="rechargeAudit.auditStatus != null and rechargeAudit.auditStatus != ''">
@@ -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
 
         <where>
             <if test="refundAudit.jwcode != null">
@@ -132,7 +136,7 @@
                 )
             </if>
             <if test="refundAudit.startTime != null and refundAudit.endTime != null ">
-                AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime}
+                AND ugr.audit_time between #{refundAudit.startTime} and #{refundAudit.endTime}
             </if>
             <if test="refundAudit.market != null and refundAudit.market != ''">
                 AND  m.name = #{refundAudit.market}