From fb29a4617d96974d14abde3c6c1202438502c7b7 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 30 Dec 2024 14:33:37 +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/controller/AuditController.java | 3 +++
 src/main/java/com/example/demo/domain/vo/ConsumeDetail.java    | 1 +
 src/main/java/com/example/demo/mapper/ConsumeMapper.java       | 2 +-
 src/main/java/com/example/demo/mapper/RefundMapper.java        | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java
index 95b48e5..ebc4269 100644
--- a/src/main/java/com/example/demo/controller/AuditController.java
+++ b/src/main/java/com/example/demo/controller/AuditController.java
@@ -3,6 +3,7 @@ package com.example.demo.controller;
 
 import com.example.demo.domain.entity.Audit;
 import com.example.demo.domain.entity.Detail;
+import com.example.demo.domain.entity.DetailY;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
@@ -22,6 +23,8 @@ import java.time.LocalDate;
 import java.time.Month;
 import java.util.Arrays;
 
+import static com.example.demo.Util.JWTUtil.getUserDetails;
+
 @RestController
 @RequestMapping("/audit/audit")
 @RequiredArgsConstructor
diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
index 5200be6..e0766d9 100644
--- a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
+++ b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
@@ -45,5 +45,6 @@ public class  ConsumeDetail {
     private String token;
     private Integer refundId;
     private String productName;
+    private String username;
 
 }
diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
index 674c534..8654d17 100644
--- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java
+++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
@@ -45,7 +45,7 @@ public interface ConsumeMapper {
     //模糊分页查询，查询消费明细
     @Select({
             "<script>",
-            "select detail_y.*,admin.name  as adminName,user.area as uarea,user.name as name,product.name as productName from detail_y ",
+            "select detail_y.*,admin.name  as adminName,product.name as productName from detail_y ",
             "left join `admin` on detail_y.admin_id=admin.admin_id ",
             "left join `user` on detail_y.jwcode= user.jwcode ",
             "left join product on detail_y.product_id= product.product_id ",
diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index a8fddf9..844a29c 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -21,9 +21,9 @@ public interface RefundMapper {
 
     @Insert({
             "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)",
+            "(jwcode,refund_type,refund_goods,contact_id,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type,order_code,consume_platform)",
             "values",
-            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},#{area},#{username},#{adminName},'客服退款')"
+            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},'客服退款')"
     })
     @Options(useGeneratedKeys = true, keyColumn = "detaily_id", keyProperty = "detailyId")
     int inserty(Detail detail);