From 37bb058f54fde2292aaf5d72e4ee9d8ced668a05 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Tue, 15 Jul 2025 10:16:14 +0800
Subject: [PATCH] flag=1

---
 src/main/resources/mapper/ConsumeMapper.xml  | 44 ++++++++++---------
 src/main/resources/mapper/RechargeMapper.xml |  2 +
 src/main/resources/mapper/RefundMapper.xml   | 65 ++++++++++++++++------------
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index aa46c39..f8e06a5 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -16,12 +16,12 @@
         ugr.remark AS remark,
         a.admin_name AS adminName,
         ugr.create_time AS createTime
-        FROM user u
-        JOIN
-        user_gold_record ugr ON u.jwcode = ugr.jwcode
-        JOIN
+        FROM user_gold_record ugr
+        left JOIN
+        user u ON u.jwcode = ugr.jwcode
+        left JOIN
         admin a ON ugr.admin_id = a.id
-        WHERE ugr.type = 1
+        WHERE ugr.type = 1 AND ugr.flag = 1
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
                 <!-- 当指定排序字段时使用指定字段排序 -->
@@ -30,7 +30,9 @@
                         <!-- 对三种金币数量的排序处理 -->
                         <when test="sortField == 'taskGold'">ugr.task_gold</when>
                         <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
-                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december,
+                            0))
+                        </when>
                         <!-- 对时间字段的排序处理 -->
                         <when test="sortField == 'createTime'">ugr.create_time</when>
                         <!-- 其他字段不支持排序，使用默认排序 -->
@@ -72,13 +74,13 @@
         ugr.remark AS remark,
         a.admin_name AS adminName,
         ugr.create_time AS createTime
-        FROM   user_gold_record ugr
+        FROM user_gold_record ugr
         left JOIN
         user u ON u.jwcode = ugr.jwcode
-       left JOIN
+        left JOIN
         admin a ON ugr.admin_id = a.id
         <where>
-            ugr.type = 1
+            ugr.type = 1 AND ugr.flag = 1
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
@@ -103,7 +105,9 @@
                         <!-- 对三种金币数量的排序处理 -->
                         <when test="sortField == 'taskGold'">ugr.task_gold</when>
                         <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
-                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december,
+                            0))
+                        </when>
                         <!-- 对时间字段的排序处理 -->
                         <when test="sortField == 'createTime'">ugr.create_time</when>
                         <!-- 其他字段不支持排序，使用默认排序 -->
@@ -132,17 +136,17 @@
     </select>
 
     <select id="selectOrderCodeByJwcode" resultType="com.example.demo.domain.vo.ConsumeUser">
-        SELECT
-        ugr.jwcode AS jwcode,
-        ugr.order_code AS orderCode,
-        ugr.is_refund AS isRefund
+        SELECT ugr.jwcode     AS jwcode,
+               ugr.order_code AS orderCode,
+               ugr.is_refund  AS isRefund
         FROM user_gold_record ugr
-        where
-            ugr.order_code =  #{orderCode}
-            AND ugr.jwcode = #{jwcode}
+        where ugr.order_code = #{orderCode}
+          AND ugr.jwcode = #{jwcode}
+          AND ugr.flag = 1
     </select>
 
-    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true" keyProperty="id">
+    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true"
+            keyProperty="id">
         INSERT INTO user_gold_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             order_code,
@@ -186,7 +190,7 @@
     <update id="updateIsRefund" parameterType="java.lang.String">
         UPDATE user_gold_record
         SET is_refund = 1
-        where
-            order_code = #{orderCode}
+        where order_code = #{orderCode}
+        AND flag = 1
     </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 84bd95d..bbd234b 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -25,6 +25,7 @@
         JOIN admin a ON ugr.admin_id = a.id
         JOIN rate r ON ugr.rate_id = r.id
         WHERE ugr.type = 0 AND ugr.audit_status IN (1,3)
+        AND ugr.flag = 1
 
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
@@ -85,6 +86,7 @@
         left JOIN rate r ON ugr.rate_id = r.id
         <where>
             ugr.type = 0 AND ugr.audit_status IN (1,3)
+            AND ugr.flag = 1
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index c04a435..db25452 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -4,26 +4,26 @@
 
     <!-- 查询所有退款记录 -->
     <select id="selectAll" resultType="com.example.demo.domain.vo.RefundUser">
-        SELECT u.name                                                        AS name,
-               u.jwcode                                                      AS jwcode,
-               u.market                                                      AS market,
-               ugr.order_code AS orderCode,
-               ugr.goods_name                                                AS goodsName,
-               ugr.refund_model                                              AS refundModel,
-               ugr.refund_type                                               AS refundType,
-               ugr.sum_gold                                                  AS sumGold,
-               ugr.permanent_gold                                            AS permanentGold,
-               (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
-               ugr.task_gold                                                 AS taskGold,
-               ugr.remark                                                    AS remark,
-               a.admin_name                                                  AS adminName,
-               ugr.create_time                                                  AS createTime
+        SELECT u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.order_code AS orderCode,
+        ugr.goods_name AS goodsName,
+        ugr.refund_model AS refundModel,
+        ugr.refund_type AS refundType,
+        ugr.sum_gold AS sumGold,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.task_gold AS taskGold,
+        ugr.remark AS remark,
+        a.admin_name AS adminName,
+        ugr.create_time AS createTime
         FROM user u
-               left JOIN
-             user_gold_record ugr ON u.jwcode = ugr.jwcode
-               left JOIN
-             admin a ON ugr.admin_id = a.id
-        WHERE ugr.type = 2 AND ugr.audit_status IN (1,3)
+        left JOIN
+        user_gold_record ugr ON u.jwcode = ugr.jwcode
+        left JOIN
+        admin a ON ugr.admin_id = a.id
+        WHERE ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
                 <!-- 当指定排序字段时使用指定字段排序 -->
@@ -32,7 +32,9 @@
                         <!-- 对三种金币数量的排序处理 -->
                         <when test="sortField == 'taskGold'">ugr.task_gold</when>
                         <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
-                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december,
+                            0))
+                        </when>
                         <!-- 对时间字段的排序处理 -->
                         <when test="sortField == 'createTime'">ugr.create_time</when>
                         <!-- 其他字段不支持排序，使用默认排序 -->
@@ -82,7 +84,7 @@
         left JOIN
         admin a ON ugr.admin_id = a.id
         <where>
-            ugr.type = 2 AND ugr.audit_status IN (1,3)
+            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
@@ -107,8 +109,12 @@
                         <!-- 对三种金币数量的排序处理 -->
                         <when test="sortField == 'taskGold'">ugr.task_gold</when>
                         <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
-                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
-                        <when test="sortField == 'sumGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)+ COALESCE(ugr.permanent_gold, 0)+ COALESCE(ugr.task_gold, 0))</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december,
+                            0))
+                        </when>
+                        <when test="sortField == 'sumGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december,
+                            0)+ COALESCE(ugr.permanent_gold, 0)+ COALESCE(ugr.task_gold, 0))
+                        </when>
                         <!-- 对时间字段的排序处理 -->
                         <when test="sortField == 'createTime'">ugr.create_time</when>
                         <!-- 其他字段不支持排序，使用默认排序 -->
@@ -136,7 +142,8 @@
         </trim>
     </select>
 
-    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true" keyProperty="id">
+    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true"
+            keyProperty="id">
         INSERT INTO user_gold_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             order_code,
@@ -178,7 +185,8 @@
     </insert>
 
     <select id="getRefundType" resultType="java.lang.String">
-        select DISTINCT refund_Type from user_gold_record
+        select DISTINCT refund_Type
+        from user_gold_record
     </select>
 
     <select id="selectGoods" resultType="com.example.demo.domain.vo.RefundUser">
@@ -186,19 +194,20 @@
 
         ugr.goods_name AS goodsName,
         ugr.order_code AS orderCode,
-        ugr.permanent_gold                                            AS permanentGold,
+        ugr.permanent_gold AS permanentGold,
         (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
-        ugr.task_gold                                                 AS taskGold
+        ugr.task_gold AS taskGold
         FROM user_gold_record ugr
         <where>
             ugr.type = 1
             AND ugr.is_refund = 0
+            AND ugr.flag = 1
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
         </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
-                ugr.create_time DESC
+            ugr.create_time DESC
         </trim>
     </select>
 </mapper>
\ No newline at end of file