tianyunperfect пре 3 година
родитељ
комит
0234163675

+ 10 - 2
book-dao/src/main/java/com/book/dao/utils/TimeUtil.java

@@ -100,6 +100,15 @@ public class TimeUtil {
         return dateToStr(getYesterday(-1), TimeUtil.YYYY_MM_DD);
     }
 
+    /**
+     * 获取明天日期字符串 yyyy-MM-dd
+     *
+     * @return
+     */
+    public static String getTomorrowStr() {
+        return dateToStr(getYesterday(1), TimeUtil.YYYY_MM_DD);
+    }
+
     /**
      * 获取当天日期字符串 yyyy-MM-dd
      *
@@ -380,7 +389,6 @@ public class TimeUtil {
     }
 
     public static void main(String[] args) throws ParseException {
-        String date = "2021-10-01";
-        System.out.println(getNextDay(date));
+        System.out.println(getTomorrowStr());
     }
 }

+ 3 - 3
book-dao/src/main/resources/mapper/polar/SunUser2Mapper.xml

@@ -3,20 +3,20 @@
 <mapper namespace="com.book.dao.polardb.mapper.SunUser2Mapper">
   <select id="selectByDay" resultType="java.util.HashMap">
     <![CDATA[
-    SELECT COUNT(DISTINCT(openid)) as new_recharge_user,sum(recharge_amount) as new_recharge_sum,count(recharge_num) as new_recharge_count FROM sun_user WHERE start_time>#{startDate} and end_time<=#{endDate} and recharge_num>0;
+    SELECT COUNT(DISTINCT(openid)) as new_recharge_user,IFNULL(sum(recharge_amount),0) as new_recharge_sum,count(recharge_num) as new_recharge_count FROM sun_user WHERE start_time>#{startDate} and end_time<=#{endDate} and recharge_num>0;
     ]]>
 </select>
   <select id="selectByDayChannel" resultType="java.util.HashMap">
     <![CDATA[
     SELECT t.*,t2.channel_name FROM
       (
-        SELECT channel_id,COUNT(DISTINCT(openid)) as new_recharge_user,sum(recharge_amount) as new_recharge_sum,count(recharge_num) as new_recharge_count  FROM sun_user WHERE start_time>#{startDate} and end_time<=#{endDate} and recharge_num>0 GROUP BY channel_id
+        SELECT channel_id,COUNT(DISTINCT(openid)) as new_recharge_user,IFNULL(sum(recharge_amount),0) as new_recharge_sum,count(recharge_num) as new_recharge_count  FROM sun_user WHERE start_time>#{startDate} and end_time<=#{endDate} and recharge_num>0 GROUP BY channel_id
       ) t LEFT JOIN sun_channel t2 on t.channel_id=t2.channel_id;
     ]]>
   </select>
   <select id="selectCountUserByDay" resultType="java.lang.Integer">
     <![CDATA[
-    SELECT COUNT(1) FROM sun_user WHERE start_time>#{startDate} and end_time<=#{endDate};
+    SELECT COUNT(1) FROM sun_user WHERE start_time > #{startDate} and end_time <= #{endDate};
     ]]>
   </select>
     <select id="selectCountByDayChannel" resultType="java.util.HashMap">

+ 1 - 2
book-server/src/main/java/com/book/server/service/impl/SunDataServiceImpl.java

@@ -452,7 +452,7 @@ public class SunDataServiceImpl implements SunDataService {
 
     @Override
     public SunStaticUserDay getTodayUserStatic() {
-        return getSunUserByDate(TimeUtil.getYesterdayStr(),TimeUtil.getTodayStr());
+        return getSunUserByDate(TimeUtil.getTodayStr(),TimeUtil.getTomorrowStr());
     }
 
     @Override
@@ -500,7 +500,6 @@ public class SunDataServiceImpl implements SunDataService {
         if (i <= 0) {
             return null;
         }
-
         HashMap<String, String> recharge = sunUser2Mapper.selectByDay(startDate,endDate);
         int new_recharge_user = getIntFromDb(recharge.get("new_recharge_user"));
         float new_recharge_sum = getFloatFromDb(recharge.get("new_recharge_sum"));

+ 7 - 0
book-server/src/main/resources/application.yml

@@ -119,3 +119,10 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
+logging:
+  level:
+    com:
+      book:
+        dao:
+          polardb:
+            mapper: debug