4.10充值明细统计的修复以及多数据库的链接

pom.xml

@@ -41,6 +41,18 @@
 			<artifactId>jjwt</artifactId>
 			<version>0.9.1</version>
 		</dependency>
+		<!--   多数据源     -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.33</version>
+		</dependency>
 
 		<dependency>
 			<groupId>javax.xml.bind</groupId>

src/main/java/com/example/demo/DemoApplication.java

@@ -3,10 +3,15 @@ package com.example.demo;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 
-@SpringBootApplication
+
+
 @EnableCaching
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@MapperScan(basePackages = {"com.example.demo.mapper.db1"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
+@MapperScan(basePackages = {"com.example.demo.mapper.db2"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
 public class DemoApplication {
 
 	public static void main(String[] args) {

src/main/java/com/example/demo/Util/BaseDES.java

@@ -93,7 +93,7 @@ public class BaseDES {
 	public static void main(String args[]) {
 		try {
 			BaseDES d = new BaseDES();
-			String encryptedText = d.encrypt("94226013");
+			String encryptedText = d.encrypt("94616995");
 			System.out.println("加密结果：" + encryptedText);
 			System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
 			System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));

src/main/java/com/example/demo/config/DBSrcArticle.java

@@ -0,0 +1,34 @@
+package com.example.demo.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.SqlSessionFactoryBean; // 正确导入SqlSessionFactoryBean
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据库leadnews_article配置
+ */
+@Configuration
+@MapperScan(basePackages = {"com.example.demo.mapper.db1"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
+public class DBSrcArticle {
+
+    @Bean
+    public SqlSessionFactory sqlSessionFactoryArticle(@Qualifier("mysql1") DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); // 修正类名
+        sqlSessionFactory.setDataSource(dataSource);
+        sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources("classpath:mapper/db1/*.xml"));
+        return sqlSessionFactory.getObject();
+    }
+
+    @Bean
+    public SqlSessionTemplate sqlSessionTemplateArticle(@Qualifier("sqlSessionFactoryArticle") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}

src/main/java/com/example/demo/config/DataSourceConfig.java

@@ -0,0 +1,29 @@
+package com.example.demo.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据源配置
+ */
+@Configuration
+public class DataSourceConfig {
+    @Primary
+    @Bean(name = "mysql1")
+    @ConfigurationProperties(prefix = "spring.datasource.mysql1")
+    public DataSource dBSrcArticle() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Primary
+    @Bean(name = "mysql2")
+    @ConfigurationProperties(prefix = "spring.datasource.mysql2")
+    public DataSource dBSrcUser() {
+        return DataSourceBuilder.create().build();
+    }
+}

src/main/java/com/example/demo/config/dBSrcUser.java

@@ -0,0 +1,37 @@
+package com.example.demo.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean; // 修复：正确导入类
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据库leadnews_user配置
+ */
+@Configuration
+@MapperScan(basePackages = {"com.example.demo.mapper.db2"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
+public class dBSrcUser {
+
+    @Bean
+    @Primary
+    public SqlSessionFactory sqlSessionFactoryUser(@Qualifier("mysql2") DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); // 修复：使用正确类名
+        sqlSessionFactory.setDataSource(dataSource);
+        sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources("classpath:mapper/db2/*.xml")); // 确保路径正确
+        return sqlSessionFactory.getObject();
+    }
+
+    @Bean
+    @Primary
+    public SqlSessionTemplate sqlSessionTemplateUser(@Qualifier("sqlSessionFactoryUser") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}

src/main/java/com/example/demo/controller/AuditController.java

@@ -5,7 +5,7 @@ import com.example.demo.Util.GoldTistV2;
 import com.example.demo.domain.entity.*;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.*;
+import com.example.demo.mapper.db1.*;
 import com.example.demo.sevice.AuditService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,8 +19,6 @@ import java.time.LocalDate;
 import java.time.Month;
 import java.util.Arrays;
 
-import static com.example.demo.Util.JWTUtil.getUserDetails;
-
 @RestController
 @RequestMapping("/audit/audit")
 @RequiredArgsConstructor

src/main/java/com/example/demo/controller/StatisticsController.java

@@ -2,18 +2,16 @@ package com.example.demo.controller;
 
 
 import com.example.demo.domain.vo.*;
-import com.example.demo.mapper.StatisticsMapper;
+import com.example.demo.mapper.db1.StatisticsMapper;
 import com.example.demo.serviceImpl.StatisticsServiceImpl;
 import com.example.demo.serviceImpl.UserServiceImpl;
 import com.example.demo.sevice.StatisticsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.Date;
 
 
 @RestController

src/main/java/com/example/demo/domain/vo/RechargeA.java

@@ -30,6 +30,6 @@ public class RechargeA {
     private String payWay;
     private String rechargeWay;
     private String area;
-    private Integer status;
+    private String auditStatus;
     private List<String> areas;
 }

src/main/java/com/example/demo/mapper/ActivityMapper.java → src/main/java/com/example/demo/mapper/db1/ActivityMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 

src/main/java/com/example/demo/mapper/AdminMapper.java → src/main/java/com/example/demo/mapper/db1/AdminMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Admin;

src/main/java/com/example/demo/mapper/AuditMapper.java → src/main/java/com/example/demo/mapper/db1/AuditMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Audit;

src/main/java/com/example/demo/mapper/ConsumeMapper.java → src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.*;

src/main/java/com/example/demo/mapper/DetailMapper.java → src/main/java/com/example/demo/mapper/db1/DetailMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Detail;

src/main/java/com/example/demo/mapper/DetailYMapper.java → src/main/java/com/example/demo/mapper/db1/DetailYMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 import com.example.demo.domain.entity.DetailY;
 import com.example.demo.domain.entity.UserDetailExport;

src/main/java/com/example/demo/mapper/OneMapper.java → src/main/java/com/example/demo/mapper/db1/OneMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.work.One;

src/main/java/com/example/demo/mapper/OtherMapper.java → src/main/java/com/example/demo/mapper/db1/OtherMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

src/main/java/com/example/demo/mapper/PermissionMapper.java → src/main/java/com/example/demo/mapper/db1/PermissionMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 import com.example.demo.domain.entity.Permission;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/demo/mapper/ProductMapper.java → src/main/java/com/example/demo/mapper/db1/ProductMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Index;

src/main/java/com/example/demo/mapper/RateMapper.java → src/main/java/com/example/demo/mapper/db1/RateMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Rate;

src/main/java/com/example/demo/mapper/RechargeMapper.java → src/main/java/com/example/demo/mapper/db1/RechargeMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Recharge;

src/main/java/com/example/demo/mapper/RefundMapper.java → src/main/java/com/example/demo/mapper/db1/RefundMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.Detail;

src/main/java/com/example/demo/mapper/StatisticsMapper.java → src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java

@@ -1,5 +1,5 @@
 
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 
@@ -10,8 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 

src/main/java/com/example/demo/mapper/UserMapper.java → src/main/java/com/example/demo/mapper/db1/UserMapper.java

@@ -1,4 +1,4 @@
-package com.example.demo.mapper;
+package com.example.demo.mapper.db1;
 
 
 import com.example.demo.domain.entity.User;

src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
 
 
 import com.example.demo.domain.entity.Activity;
-import com.example.demo.mapper.ActivityMapper;
+import com.example.demo.mapper.db1.ActivityMapper;
 import com.example.demo.sevice.ActivityService;
 import com.github.pagehelper.PageHelper;
 import lombok.RequiredArgsConstructor;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageInfo;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java

@@ -2,7 +2,7 @@ package com.example.demo.serviceImpl;
 
 
 import com.example.demo.domain.entity.Admin;
-import com.example.demo.mapper.AdminMapper;
+import com.example.demo.mapper.db1.AdminMapper;
 import com.example.demo.security.SecurityConfig;
 import com.example.demo.sevice.AdminService;
 import com.github.pagehelper.PageHelper;
@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -5,12 +5,13 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.Util.GoldTistV2;
 import com.example.demo.domain.entity.*;
-import com.example.demo.domain.vo.ConsumeDetail;
-import com.example.demo.mapper.*;
+import com.example.demo.mapper.db1.AuditMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
+import com.example.demo.mapper.db1.RefundMapper;
+import com.example.demo.mapper.db1.UserMapper;
 import com.example.demo.sevice.AuditService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -5,11 +5,9 @@ package com.example.demo.serviceImpl;
 import com.example.demo.Util.GoldTistV2;
 import com.example.demo.domain.entity.*;
 import com.example.demo.domain.vo.ConsumeDetail;
-import com.example.demo.domain.vo.DetailVo;
-import com.example.demo.domain.vo.DetailYVo;
 import com.example.demo.domain.vo.SumConsume;
-import com.example.demo.mapper.ConsumeMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.ConsumeMapper;
+import com.example.demo.mapper.db1.UserMapper;
 import com.example.demo.sevice.ConsumeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,7 +15,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java

@@ -2,14 +2,13 @@ package com.example.demo.serviceImpl;
 
 
 import com.example.demo.domain.entity.Detail;
-import com.example.demo.mapper.DetailMapper;
+import com.example.demo.mapper.db1.DetailMapper;
 import com.example.demo.sevice.DetailService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java

@@ -5,7 +5,7 @@ import com.example.demo.domain.entity.UserDetailExport;
 import com.example.demo.domain.vo.DetailExport;
 import com.example.demo.domain.vo.DetailYgold;
 import com.example.demo.domain.vo.SumDetailY;
-import com.example.demo.mapper.DetailYMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
 import com.example.demo.sevice.DetailYService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -15,7 +15,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service

src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
 import com.example.demo.domain.work.One;
 import com.example.demo.domain.work.Three;
 import com.example.demo.domain.work.Two;
-import com.example.demo.mapper.OneMapper;
+import com.example.demo.mapper.db1.OneMapper;
 import com.example.demo.sevice.OneService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java

@@ -5,11 +5,10 @@ import com.example.demo.domain.entity.DetailY;
 import com.example.demo.domain.entity.Recharge;
 import com.example.demo.domain.entity.UserGold;
 import com.example.demo.domain.vo.ERP;
-import com.example.demo.domain.vo.RechargeVo;
-import com.example.demo.mapper.DetailYMapper;
-import com.example.demo.mapper.OtherMapper;
-import com.example.demo.mapper.RechargeMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
+import com.example.demo.mapper.db1.OtherMapper;
+import com.example.demo.mapper.db1.RechargeMapper;
+import com.example.demo.mapper.db1.UserMapper;
 import com.example.demo.sevice.OtherService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -1,7 +1,7 @@
 package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.Permission;
-import com.example.demo.mapper.PermissionMapper;
+import com.example.demo.mapper.db1.PermissionMapper;
 import com.example.demo.sevice.PermissionService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheConfig;

src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java

@@ -3,11 +3,10 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.Index;
 import com.example.demo.domain.entity.Product;
-import com.example.demo.mapper.ProductMapper;
+import com.example.demo.mapper.db1.ProductMapper;
 import com.example.demo.sevice.ProductService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.Rate;
 import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.RateMapper;
+import com.example.demo.mapper.db1.RateMapper;
 import com.example.demo.sevice.RateService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@@ -3,15 +3,13 @@ package com.example.demo.serviceImpl;
 import com.example.demo.domain.entity.Audit;
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.Recharge;
-import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.RechargeA;
 import com.example.demo.domain.vo.RechargeVo;
-import com.example.demo.domain.vo.RefundA;
 import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.AuditMapper;
-import com.example.demo.mapper.DetailMapper;
-import com.example.demo.mapper.RechargeMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.AuditMapper;
+import com.example.demo.mapper.db1.DetailMapper;
+import com.example.demo.mapper.db1.RechargeMapper;
+import com.example.demo.mapper.db1.UserMapper;
 import com.example.demo.sevice.RechargeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -19,18 +17,14 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.Month;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 @Transactional
 @Service
@@ -185,14 +179,14 @@ public class RechargeServiceImpl implements RechargeService {
         List<String> fullStatuses = Arrays.asList("待审核", "已通过", "已驳回");
 
         // 遍历分类列表，检查哪些分类在查询结果中缺失，并为其补充默认值
-        for (String flag : fullStatuses) {
+        for (String auditStatus : fullStatuses) {
             boolean categoryExists = result.stream()
-                    .anyMatch(recharge -> flag.equals(recharge.getFlag()));
+                    .anyMatch(recharge -> auditStatus.equals(recharge.getAuditStatus()));
 
             if (!categoryExists) {
                 // 如果分类缺失，补充默认值
                 RechargeA defaultRecharge = new RechargeA();
-                defaultRecharge.setFlag(flag);
+                defaultRecharge.setAuditStatus(auditStatus);
 //                defaultRecharge.setAmount(BigDecimal.ZERO); // 默认值为 0
                 result.add(defaultRecharge);
             }

src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.vo.RefundA;
-import com.example.demo.mapper.RefundMapper;
+import com.example.demo.mapper.db1.RefundMapper;
 import com.example.demo.sevice.RefundService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

@@ -9,21 +9,16 @@ import com.example.demo.domain.vo.Meium;
 import com.example.demo.domain.vo.Statistics;
 import com.example.demo.domain.vo.Statisticss;
 import com.example.demo.domain.vo.SumCoin;
-import com.example.demo.mapper.StatisticsMapper;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.StatisticsMapper;
+import com.example.demo.mapper.db1.UserMapper;
 import com.example.demo.sevice.StatisticsService;
 import lombok.RequiredArgsConstructor;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 @RequiredArgsConstructor

src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java

@@ -2,11 +2,9 @@ package com.example.demo.serviceImpl;
 
 
 import com.example.demo.domain.entity.Admin;
-import com.example.demo.mapper.AdminMapper;
+import com.example.demo.mapper.db1.AdminMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.UserVo;
-import com.example.demo.mapper.UserMapper;
+import com.example.demo.mapper.db1.UserMapper;
 import com.example.demo.sevice.UserSevice;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

src/main/java/com/example/demo/sevice/DataExportService.java

@@ -1,7 +1,7 @@
 package com.example.demo.sevice;
 
 import com.example.demo.domain.entity.UserDetailExport;
-import com.example.demo.mapper.DetailYMapper;
+import com.example.demo.mapper.db1.DetailYMapper;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/resources/application.yml

@@ -12,6 +12,7 @@ spring:
       max-file-size: 10MB
       max-request-size: 100MB
   datasource:
+    mysql1:
       hikari:
         maximum-pool-size: 10
         minimum-idle: 5
@@ -20,9 +21,22 @@ spring:
         connection-timeout: 30000
         pool-name: HwgoldHikariCP
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
       username: hwgold
       password: 'AGX4Z3YMxiCG3GR2'
+    mysql2:
+      hikari:
+        maximum-pool-size: 10
+        minimum-idle: 5
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000
+        pool-name: HwgoldHikariCP
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
+      username: hljw
+      password: '5dmWCCKfEk3TTeyn'
   application:
     name: demo
   cache:

src/main/resources/mapper/ConsumeMapper.xml → src/main/resources/mapper/db1/ConsumeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.ConsumeMapper">
+<mapper namespace="com.example.demo.mapper.db1.ConsumeMapper">
     <select id="getSumConsume" resultType="com.example.demo.domain.vo.SumConsume">
         SELECT
         sum(free_coin) as SumFcion,

src/main/resources/mapper/DetailYMapper.xml → src/main/resources/mapper/db1/DetailYMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.DetailYMapper"  >
+<mapper namespace="com.example.demo.mapper.db1.DetailYMapper"  >
 <select id="select" resultType="com.example.demo.domain.entity.DetailY">
     SELECT
     username,

src/main/resources/mapper/OneMapper.xml → src/main/resources/mapper/db1/OneMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.OneMapper">
+<mapper namespace="com.example.demo.mapper.db1.OneMapper">
 
     <!-- 第一个查询：getOne -->
     <select id="getOne" resultType="com.example.demo.domain.work.One">

src/main/resources/mapper/ProductMapper.xml → src/main/resources/mapper/db1/ProductMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.ProductMapper">
+<mapper namespace="com.example.demo.mapper.db1.ProductMapper">
     <insert id="add" parameterType="com.example.demo.domain.entity.Product">
         INSERT INTO user (price, name,listed_time,down_time,remark,subjects,type,product_flag,create_time)
         VALUES (#{price}, #{name},#{listedTime},#{downTime},#{remark},#{subjects},#{type},#{productFlag},#{createTime})

src/main/resources/mapper/RechargeMapper.xml → src/main/resources/mapper/db1/RechargeMapper.xml

@@ -3,17 +3,16 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.example.demo.mapper.RechargeMapper">
+<mapper namespace="com.example.demo.mapper.db1.RechargeMapper">
 
     <select id="getRechargeA" resultType="com.example.demo.domain.vo.RechargeA">
         SELECT
-            user.area,
         CASE
-        WHEN flag = 0 THEN '待审核'
-        WHEN flag = 1 THEN '已通过'
-        WHEN flag = 2 THEN '已驳回'
+        WHEN audit.status = 0 THEN '待审核'
+        WHEN audit.status = 1 THEN '已通过'
+        WHEN audit.status = 2 THEN '已驳回'
         ELSE '其他状态'
-        END AS flag,
+        END AS auditStatus,
         COUNT(*) AS Raudit,
         SUM(paid_gold) AS SumRaudit1,
         SUM(free_gold) AS SumRaudit2,
@@ -21,6 +20,7 @@
         FROM
         recharge
         LEFT JOIN `user` ON recharge.jwcode = `user`.jwcode
+        inner JOIN audit ON recharge.recharge_id = audit.recharge_id
         <where>
             <!-- 动态条件：flag -->
             <if test="flags != null and flags.size > 0">
@@ -36,7 +36,7 @@
             <if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>
             <if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>
             <if test='area!=null and area.length>0'>and user.area=#{area}</if>
-            <if test='status!=null'>and audit.status=#{status}</if>
+
             <if test="areas != null">
                 AND user.area IN
                 <foreach collection="areas" item="areas" open="(" separator="," close=")">
@@ -45,7 +45,7 @@
             </if>
         </where>
         GROUP BY
-        flag;
+        auditStatus;
     </select>
     <select id="getWay" resultType="java.lang.String">
         SELECT DISTINCT

src/main/resources/mapper/RefundMapper.xml → src/main/resources/mapper/db1/RefundMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.RefundMapper">
+<mapper namespace="com.example.demo.mapper.db1.RefundMapper">
     <select id="getRefundA" resultType="com.example.demo.domain.vo.RefundA">
         SELECT
         CASE

src/main/resources/mapper/StatisticsMapper.xml → src/main/resources/mapper/db1/StatisticsMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.example.demo.mapper.StatisticsMapper">
+<mapper namespace="com.example.demo.mapper.db1.StatisticsMapper">
     <select id="getMeium" resultType="com.example.demo.domain.vo.Meium">
         SELECT
         u.area,

src/main/resources/mapper/UserMapper.xml → src/main/resources/mapper/db1/UserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.UserMapper">
+<mapper namespace="com.example.demo.mapper.db1.UserMapper">
     <insert id="add" parameterType="com.example.demo.domain.entity.User">
         INSERT INTO user (jwcode, name, area)
         VALUES (#{jwcode}, #{name}, #{area})