From 507f7090a4a661d45d481f6dd06efee6d994d975 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Tue, 15 Jul 2025 10:02:03 +0800
Subject: [PATCH] =?UTF-8?q?7.15=E7=AD=9B=E9=80=89=E9=9D=9E=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java | 7 ++++++-
 src/main/resources/mapper/GoldDetailMapper.xml             | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
index b455b49..1aa4146 100644
--- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
+++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
@@ -77,7 +77,7 @@ public class MysqlServiceImpl implements MysqlService {
                 //退款类型 61：ERP退款（退金币）
                 String insertSql = "INSERT INTO user_gold_record (order_code,jwcode,sum_gold,permanent_gold,free_june,free_december," +
                         "task_gold,pay_platform,goods_name,refund_type,refund_model,remark,type,admin_id," +
-                        "audit_status,create_time) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+                        "audit_status,create_time,flag) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
                 try (PreparedStatement mysqlStmt = mysqlConn.prepareStatement(insertSql)) {
                     while (resultSet.next()) {
                         int gtype = resultSet.getInt("gtype");
@@ -159,6 +159,11 @@ public class MysqlServiceImpl implements MysqlService {
                         mysqlStmt.setString(12, remark);
                         mysqlStmt.setInt(15, 3);
                         mysqlStmt.setTimestamp(16, created_at);
+                        if(remark.contains("测试")){
+                            mysqlStmt.setInt(17, 0);
+                        }else {
+                            mysqlStmt.setInt(17, 1);
+                        }
 
                        // 更新时的值
                         mysqlStmt.addBatch();
diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml
index 5961ff2..76ad21c 100644
--- a/src/main/resources/mapper/GoldDetailMapper.xml
+++ b/src/main/resources/mapper/GoldDetailMapper.xml
@@ -13,6 +13,7 @@
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id
         <where>
+            ugr.flag = 1 and
              ugr.audit_status IN (1,3)
             <if test="jwcode != null">
                 and ugr.jwcode = #{jwcode}
@@ -44,6 +45,8 @@
         select sum(sum_gold) as Goldtotal, sum(permanent_gold) as permanentGold, sum(free_june+free_december) as freeGold, sum(task_gold) as taskGold
         from user_gold_record
         <where>
+            ugr.flag = 1 and
+            ugr.audit_status IN (1,3)
             <if test="jwcode != null">
                 and `ugr`.jwcode = #{jwcode}
             </if>
@@ -103,6 +106,7 @@
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id
         <where>
+            ugr.flag = 1
             <if test="jwcode != null">
                 and `ugr`.jwcode = #{jwcode}
             </if>