diff --git a/pom.xml b/pom.xml
index bf598a5..09fb9bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-<!--	<version>0.0.2-SNAPSHOT</version>-->
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
+<!--	<version>0.0.3-SNAPSHOT</version>-->
 	<name>demo</name>
 	<description>demo</description>
 
diff --git a/src/main/java/com/example/demo/domain/work/Three.java b/src/main/java/com/example/demo/domain/work/Three.java
index af3a095..f2f41b8 100644
--- a/src/main/java/com/example/demo/domain/work/Three.java
+++ b/src/main/java/com/example/demo/domain/work/Three.java
@@ -16,4 +16,7 @@ public class Three {
     private BigDecimal yestdayCoin;
     private BigDecimal yestdayGold;
     private BigDecimal yestdayrefund;
+    private BigDecimal rechargegold ;
+    private BigDecimal freegold ;
+    private BigDecimal taskgold ;
 }
diff --git a/src/main/java/com/example/demo/domain/work/Two.java b/src/main/java/com/example/demo/domain/work/Two.java
index 0d40c7d..4e3a36f 100644
--- a/src/main/java/com/example/demo/domain/work/Two.java
+++ b/src/main/java/com/example/demo/domain/work/Two.java
@@ -14,4 +14,7 @@ public class Two {
     private BigDecimal totalcoin;
     private BigDecimal yesterdaytotal;
     private BigDecimal yesterdayrecharge;
+    private BigDecimal rechargegold ;
+    private BigDecimal freegold ;
+    private BigDecimal taskgold ;
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 921220b..f35c424 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,8 +20,8 @@ spring:
       connection-timeout: 30000
       pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
-    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'
   application:
diff --git a/src/main/resources/mapper/OneMapper.xml b/src/main/resources/mapper/OneMapper.xml
index cd23ba1..51eae19 100644
--- a/src/main/resources/mapper/OneMapper.xml
+++ b/src/main/resources/mapper/OneMapper.xml
@@ -3,61 +3,102 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.demo.mapper.OneMapper">
+
+    <!-- 第一个查询：getOne -->
     <select id="getOne" resultType="com.example.demo.domain.work.One">
         SELECT
-            (SELECT SUM(recharge_coin + free_coin + task_coin)
-             FROM detail_y
-             WHERE DATE(create_time) = CURDATE()) AS differr,
-            (SELECT SUM(free_6 + free_12 + core_jb + buy_jb)
-        FROM user_gold) AS sumgold,
-            (SELECT SUM(buy_jb)
-        FROM user_gold) AS rechargegold,
-            (SELECT SUM(free_6)
-        FROM user_gold) AS sfreegold,
-            (SELECT SUM(free_12)
-        FROM user_gold) AS dfreegold,
-            (SELECT SUM(core_jb)
-        FROM user_gold) AS taskgold,
-            (SELECT SUM(free_6) + SUM(free_12)
-        FROM user_gold) AS freegold;
+            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
+                      FROM detail_y
+                      WHERE DATE(create_time) = CURDATE()), 0) AS differr,
+
+            COALESCE((SELECT SUM(free_6 + free_12 + core_jb + buy_jb)
+                      FROM user_gold), 0) AS sumgold,
+
+            COALESCE((SELECT SUM(buy_jb)
+                      FROM user_gold), 0) AS rechargegold,
+
+            COALESCE((SELECT SUM(free_6)
+                      FROM user_gold), 0) AS sfreegold,
 
+            COALESCE((SELECT SUM(free_12)
+                      FROM user_gold), 0) AS dfreegold,
+
+            COALESCE((SELECT SUM(core_jb)
+                      FROM user_gold), 0) AS taskgold,
+
+            COALESCE((SELECT SUM(free_6) + SUM(free_12)
+                      FROM user_gold), 0) AS freegold;
     </select>
+
+    <!-- 第二个查询：getTwo -->
     <select id="getTwo" resultType="com.example.demo.domain.work.Two">
         SELECT
-            (SELECT SUM(recharge_coin + free_coin + task_coin)
-             FROM detail_y
-             WHERE YEAR(create_time) = YEAR(CURDATE())
-           AND update_type = 0) AS totalgold,
-        (SELECT SUM(recharge_coin)
-        FROM detail_y
-        WHERE YEAR(create_time) = YEAR(CURDATE())
-          AND update_type = 0) AS totalcoin,
-            (SELECT SUM(recharge_coin + free_coin + task_coin)
-        FROM detail_y
-        WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-          AND update_type = 0) AS yesterdaytotal,
-            (SELECT SUM(recharge_coin)
-        FROM detail_y
-        WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-          AND update_type = 0) AS yesterdayrecharge
+            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 0), 0) AS totalgold,
+
+            COALESCE((SELECT SUM(recharge_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 0), 0) AS totalcoin,
+
+            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
+                      FROM detail_y
+                      WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+                         AND update_type = 0), 0) AS yesterdaytotal,
+
+            COALESCE((SELECT SUM(recharge_coin)
+                      FROM detail_y
+                      WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+                         AND update_type = 0), 0) AS yesterdayrecharge,
+            COALESCE((SELECT SUM(recharge_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 0), 0) AS freegold,
+            COALESCE((SELECT SUM(free_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 0), 0) AS rechargegold,
+            COALESCE((SELECT SUM(task_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 0), 0) AS taskgold
     </select>
+
+    <!-- 第三个查询：getThree -->
     <select id="getThree" resultType="com.example.demo.domain.work.Three">
         SELECT
-            (SELECT SUM(recharge_coin + free_coin + task_coin)
-             FROM detail_y
-             WHERE YEAR(create_time) = YEAR(CURDATE())
-           AND update_type = 1) AS consumeGold,
-        (SELECT SUM(recharge_coin + free_coin + task_coin)
-        FROM detail_y
-        WHERE YEAR(create_time) = YEAR(CURDATE())
-          AND update_type = 2) AS refundcoin,
-            (SELECT SUM(recharge_coin + free_coin + task_coin)
-        FROM detail_y
-        WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-          AND update_type = 1) AS yesterdayGold,
-            (SELECT SUM(recharge_coin)
-        FROM detail_y
-        WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-          AND update_type = 2) AS yesterdayrefund
+            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 1), 0) AS consumeGold,
+
+            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 2), 0) AS refundcoin,
+
+            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
+                      FROM detail_y
+                      WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+                         AND update_type = 1), 0) AS yesterdayGold,
+
+            COALESCE((SELECT SUM(recharge_coin)
+                      FROM detail_y
+                      WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+                         AND update_type = 2), 0) AS yesterdayrefund,
+            COALESCE((SELECT SUM(recharge_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 1), 0) AS rechargegold,
+            COALESCE((SELECT SUM(task_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 1), 0) AS taskgold,
+            COALESCE((SELECT SUM(free_coin)
+                      FROM detail_y
+                      WHERE YEAR(create_time) = YEAR(CURDATE())
+                        AND update_type = 1), 0) AS freegold
     </select>
 </mapper>
\ No newline at end of file