From 4f77c9ffd96897f676f102cb5635547d362b7e97 Mon Sep 17 00:00:00 2001
From: zhangluping <1801075613@qq.com>
Date: Mon, 30 Dec 2024 13:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/DetailMapper.java | 5 ++---
 src/main/java/com/example/demo/mapper/RefundMapper.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/DetailMapper.java b/src/main/java/com/example/demo/mapper/DetailMapper.java
index 76d5119..abf6672 100644
--- a/src/main/java/com/example/demo/mapper/DetailMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailMapper.java
@@ -31,9 +31,8 @@ public interface DetailMapper {
     @Select({
             "<script>",
         "select detail.jwcode,detail.admin_id,detail.detail_id,detail.recharge_coin,detail.free_coin,detail.task_coin," +
-                "detail.update_type,detail.create_time, admin.name,admin.area,user.name as uname,audit.status from detail",
-            "inner join `admin` on detail.admin_id = `admin`.admin_id",
-            "inner join `user` on detail.jwcode = `user`.jwcode",
+                "detail.update_type,detail.create_time, detail.create_admin as adminName ,user.area,user.name as username,audit.status from detail",
+            "left join `user` on detail.jwcode = `user`.jwcode",
             "left join audit on detail.detail_id=audit.detail_id",
             "<where>",
             "(status is null or status='1')",
diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index b17ab30..a8fddf9 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -23,7 +23,7 @@ public interface RefundMapper {
             "insert into detail_y",
             "(jwcode,refund_type,refund_goods,contact_id,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type,order_code,area,username,name,consume_platform)",
             "values",
-            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},#{area},#{username},#{name},'客服退款')"
+            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},#{area},#{username},#{adminName},'客服退款')"
     })
     @Options(useGeneratedKeys = true, keyColumn = "detaily_id", keyProperty = "detailyId")
     int inserty(Detail detail);