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
@@ -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
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
@@ -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}