From 72ec61bad1c72f0f5ab9af2bc1bf35ac4b453022 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Tue, 24 Dec 2024 14:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/RechargeMapper.java | 4 +++-
 src/main/java/com/example/demo/mapper/RefundMapper.java   | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java
index 3ab1fae..7d20c19 100644
--- a/src/main/java/com/example/demo/mapper/RechargeMapper.java
+++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java
@@ -32,7 +32,9 @@ public interface RechargeMapper {
 
     @Select({
             "<script>",
-            "SELECT DISTINCT user.`name` as user_name , recharge.*,activity.activity_name,audit.`status`,audit.audit_id,audit.reson, admin.name,admin.area,audit.detail_id  FROM recharge",
+            "SELECT user.`name` as user_name,recharge.jwcode,recharge.create_time,recharge.recharge_time," +
+                    "recharge.recharge_way,recharge.remark,recharge.paid_gold,recharge.free_gold,recharge.pay_way,recharge.recharge_voucher," +
+                    "recharge.recharge_id,recharge.activity_id,recharge.admin_id,activity.activity_name,audit.`status`,audit.audit_id,audit.reson, admin.name,user.area,audit.detail_id  FROM recharge",
                     "LEFT JOIN audit ON recharge.recharge_id = audit.recharge_id",
                     "LEFT JOIN `user` ON recharge.jwcode = `user`.jwcode",
                     "LEFT JOIN activity on recharge.activity_id = activity.activity_id",
diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index a449deb..7c94706 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -66,16 +66,14 @@ public interface RefundMapper {
 
     @Select({
             "<script>",
-            "SELECT d.jwcode,d.refund_type,d.refund_goods,d.recharge_coin,d.free_coin,d.task_coin,d.remark,d.create_time ,",
-            "       a.area AS adminArea, a.name AS adminName,",
+            "SELECT d.jwcode,d.refund_type,d.refund_goods,d.recharge_coin,d.free_coin,d.task_coin,d.remark,d.create_time,d.create_admin,",
+            "       u.area,",
             "       u.name AS userName,",
             "       au.status AS auditStatus, au.reson AS auditReson",
-            "FROM detail d",
-            "LEFT JOIN admin a ON d.admin_id = a.admin_id",
+            "FROM detail_y d",
             "LEFT JOIN user u ON d.jwcode = u.jwcode",
             "LEFT JOIN audit au ON d.detail_id = au.refund_id",
             "WHERE d.detail_flag = 1 and update_type = 2 ",
-            "<if test='auditStatus!=null'>and auditStatus=#{auditStatus}</if>",
             "<if test='jwcode != null'>AND d.jwcode = #{jwcode}</if>",
             "<if test='refundType != null'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>",
             "<if test='refundGoods != null'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>",