From 8a57b3a0ee3fa70e8d43eb12865f1c27d0d385d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 14:55:58 +0800
Subject: [PATCH] Merge branch 'div-1' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml
index 74fe0e9..a01aeb1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml
@@ -40,14 +40,14 @@
</select>
- <select id="countActiveNumByDate" resultType="java.lang.Integer">
- SELECT IFNULL(COUNT(dd.`uie_uid`),0)
- FROM (SELECT t.`uie_uid`, MAX(d.`lua_createtime`) AS lastDate FROM `yeshi_ec_user_info_extra` t
- LEFT JOIN `yeshi_ec_log_user_active` d ON t.`uie_uid` = d.`lua_uid`
- WHERE TO_DAYS(t.`uie_active_time`) = TO_DAYS('${date}')
- AND TO_DAYS(d.`lua_createtime`) <![CDATA[<]]> TO_DAYS('${date}')
- GROUP BY d.`lua_uid`)dd
- WHERE dd.lastDate <![CDATA[<]]> DATE_SUB('${date}', INTERVAL 90 DAY)
+ <select id="countActiveNumByDate" resultType="Long">
+ SELECT COUNT(BB.lua_uid) FROM (SELECT d.`lua_uid` FROM yeshi_ec_log_user_active d
+ WHERE TO_DAYS(d.`lua_createtime`) = TO_DAYS(#{preDay})
+ GROUP BY d.`lua_uid`) A
+ LEFT JOIN (SELECT lua_uid FROM (SELECT d.`lua_uid`,MAX(d.`lua_createtime`) AS maxTime FROM yeshi_ec_log_user_active d
+ WHERE TO_DAYS(d.`lua_createtime`) <![CDATA[<]]> TO_DAYS(#{preDay})
+ GROUP BY d.`lua_uid`) B WHERE B.`maxTime` <![CDATA[<]]> DATE_SUB(#{preDay}, INTERVAL 90 DAY))BB ON A.lua_uid = BB.lua_uid
+ WHERE BB.lua_uid IS NOT NULL
</select>
--
Gitblit v1.8.0