From 760f51b3fa4fac28eac2162b261f35f554f6c944 Mon Sep 17 00:00:00 2001
From: zhangluping <1801075613@qq.com>
Date: Fri, 20 Dec 2024 16:40:17 +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/RefundMapper.java | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index 3e22535..7e0ff19 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -13,7 +13,7 @@ public interface RefundMapper {
             "insert into detail",
             "(jwcode,refund_type,refund_goods,contact_id,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type,order_code)",
             "values",
-            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),'退款',#{orderCode})"
+            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode})"
     })
     @Options(useGeneratedKeys = true, keyColumn = "detail_id", keyProperty = "detailId")
     int insert(Detail detail);
@@ -66,7 +66,7 @@ public interface RefundMapper {
 
     @Select({
             "<script>",
-            "SELECT d.*,",
+            "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,",
             "       u.name AS userName,",
             "       au.status AS auditStatus, au.reson AS auditReson",
@@ -74,21 +74,11 @@ public interface RefundMapper {
             "LEFT JOIN admin a ON d.admin_id = a.admin_id",
             "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 ='退款'",
+            "WHERE d.detail_flag = 1 and update_type = 2 ",
             "<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>",
-            "<if test='rechargeCoin != null'>AND d.recharge_coin = #{rechargeCoin}</if>",
-            "<if test='freeCoin != null'>AND d.free_coin = #{freeCoin}</if>",
-            "<if test='taskCoin != null'>AND d.task_coin = #{taskCoin}</if>",
-            "<if test='remark != null'>AND d.remark LIKE CONCAT('%', #{remark}, '%')</if>",
             "<if test='startDate != null and endDate != null'>AND d.create_time BETWEEN #{startDate} AND #{endDate}</if>",
-            "<if test='adminId != null'>AND d.admin_id = #{adminId}</if>",
-            "<if test='adminArea != null'>AND a.area LIKE CONCAT('%', #{adminArea}, '%')</if>", // admin表字段过滤
-            "<if test='adminName != null'>AND a.name LIKE CONCAT('%', #{adminName}, '%')</if>", // admin表字段过滤
-            "<if test='userName != null'>AND u.name LIKE CONCAT('%', #{userName}, '%')</if>", // user表字段过滤
-            "<if test='auditStatus != null and auditStatus.length>0'>AND au.status = #{auditStatus}</if>", // audit 表字段过滤
-            "<if test='auditReson != null'>AND au.reson LIKE CONCAT('%', #{auditReson}, '%')</if>", // audit表字段过滤
             "ORDER BY d.create_time DESC",
             "</script>"
     })