From 2d2ef388ad10a89faff1b5e3a093383408e8738f Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Tue, 12 Aug 2025 13:26:03 +0800
Subject: [PATCH] =?UTF-8?q?8-12=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=8E=BB=E9=99=A4=E5=91=98=E5=B7=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-test.yml        | 6 +++---
 src/main/resources/mapper/StatisticsMapper.xml | 4 ++++
 src/main/resources/mapper/WorkBenchMapper.xml  | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 0bd95af..1f0669b 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -4,9 +4,9 @@ spring:
       fail-on-unknown-properties: false
   datasource:
     mysql1:
-      jdbc-url: jdbc:mysql://54.255.212.181:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
-      username: hwgoldc
-      password: zB48T55wCsHC8KPz
+      jdbc-url: jdbc:mysql://54.255.212.181:3306/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true
+      username: hwgold
+      password: aDiw7MERSATdfGta
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql1HikariCP
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index cc03837..63d45b4 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -93,6 +93,7 @@
           AND ugr.type=0
           AND ugr.audit_status IN (1,3)
           AND ugr.audit_time BETWEEN #{startTime} AND #{endTime}
+          AND u.flag = 1
     </select>
 
     <!--获取某地区某时间所在日期的数据（仅一条）-->
@@ -142,6 +143,7 @@
         FROM user u
         left join market m on u.market=m.id
         where m.name IS NOT NULL
+        and u.flag = 1
         GROUP BY market
     </select>
     <select id="listPart2All" resultType="com.example.demo.domain.entity.Statistics">
@@ -168,6 +170,7 @@
           AND ugr.flag = 1
           AND ugr.create_time BETWEEN #{start} AND #{end}
           AND m.name IS NOT NULL
+          AND u.flag = 1
         GROUP BY u.market
     </select>
     <select id="listYearAll" resultType="com.example.demo.domain.entity.Statistics">
@@ -219,6 +222,7 @@
         WHERE ugr.audit_status IN (1,3)
           AND ugr.flag = 1
           AND m.name IS NOT NULL
+          AND u.flag = 1
         GROUP BY  m.name, d.create_date
     </select>
 
diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml
index e9de162..fbefad6 100644
--- a/src/main/resources/mapper/WorkBenchMapper.xml
+++ b/src/main/resources/mapper/WorkBenchMapper.xml
@@ -55,6 +55,7 @@
             #{startDate} and #{endDate}
         AND ugr.audit_status IN (1,3)
           and ugr.flag=1
+          AND u.flag = 1
 
     </select>
     <!--给定时间范围内的该地区消费永久金币数-->
@@ -105,6 +106,7 @@
                   AND ugr.pay_time BETWEEN #{startDate} AND #{endDate}
                   AND ugr.audit_status IN (1, 3)
                   and ugr.flag=1
+                  AND u.flag = 1
             ) AS totalRechargeNum
         FROM statistics s
         WHERE s.market = #{market}