fanli-server.git

			@@ -322,14 +322,13 @@


			<select id="countNewUser" resultType="java.lang.Long">
			<!-- 自购订单 -->
			SELECT COALESCE(count(id),0) FROM `yeshi_ec_user`
			WHERE 1 > 0
			WHERE 1=1
			<if test="isToday != null and isToday == 1">
			AND TO_DAYS(FROM_UNIXTIME(createtime/1000)) = TO_DAYS(NOW())
			AND TO_DAYS(FROM_UNIXTIME(createtime/1000)) = TO_DAYS(NOW())
			</if>
			<if test="isMonth != null and isMonth == 1">
			AND DATE_FORMAT( FROM_UNIXTIME(createtime/1000), '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
			AND DATE_FORMAT( FROM_UNIXTIME(createtime/1000), '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m' )
			</if>
			</select>

			@@ -371,18 +370,18 @@
			<select id="countLoseUser" resultType="java.lang.Long">
			SELECT COUNT(DISTINCT t.`id` ) FROM `yeshi_ec_user` t
			LEFT JOIN `yeshi_ec_user_money_detail` d ON d.`umd_uid` = t.`id`
			WHERE DATE_SUB(CURDATE(), INTERVAL ${num} DAY) > DATE(FROM_UNIXTIME( t.`last_logintime`/1000))
			AND DATE_SUB(CURDATE(), INTERVAL ${num} DAY) > DATE(d.`umd_createtime`)
			WHERE DATE_SUB(CURDATE(), INTERVAL ${num} DAY)<![CDATA[> ]]> DATE(FROM_UNIXTIME( t.`last_logintime`/1000))
			AND DATE_SUB(CURDATE(), INTERVAL ${num} DAY) <![CDATA[> ]]> DATE(d.`umd_createtime`)
			</select>

			<select id="countHasOrderUser" resultType="java.lang.Long">
			SELECT COUNT(DISTINCT h.`hb_uid`) FROM yeshi_ec_hongbao_v2 h
			WHERE h.`hb_type`=1 or h.`hb_type`=2
			WHERE (h.`hb_type`=1 or h.`hb_type`=2 or h.`hb_type`= 20)
			</select>


			<select id="countNewUserByDate" resultType="java.util.HashMap">
			SELECT COUNT(h.`id`) AS showValue,
			SELECT COUNT(DISTINCT h.`id`) AS showValue,
			<if test="type == 1">
			FROM_UNIXTIME(h.`createtime`/1000,'%Y-%m-%d') AS 'showDate'
			</if>
			@@ -423,7 +422,7 @@
			</select>

			<select id="getTodayHasOrder" resultType="java.util.HashMap">
			SELECT COALESCE(COUNT(u.`id`),0) AS 'showValue',
			SELECT COALESCE(COUNT(DISTINCT u.`id`),0) AS 'showValue',
			<if test="type == 1">
			FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate'
			</if>
			@@ -445,7 +444,7 @@
			AND a.uid is not null
			</if>
			<!-- 当日下单 -->
			AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = FROM_UNIXTIME(h.hb_create_time/1000,'%Y-%m-%d')
			AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = DATE_FORMAT(h.hb_create_time,'%Y-%m-%d')

			<if test="startTime != null and startTime != '' ">
			AND FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d')<![CDATA[ >= ]]>'${startTime}'
			@@ -470,41 +469,32 @@



			<select id="countWeekUserInfo" resultType="java.util.HashMap">
			SELECT COALESCE(SUM(w.total),0) AS totalUser,COALESCE(SUM(w.orderUser),0)AS orderUser FROM
			(
			<!-- 统计总当日总数量 -->
			SELECT COUNT(u.`id`)AS total,0 AS orderUser
			FROM yeshi_ec_user u
			<if test="channel != null and channel != 'all' ">
			LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a
			WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON u.`id`=a.uid
			</if>
			WHERE FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = '${startTime}'
			<if test="channel != null and channel != 'all' ">
			AND a.uid is not null
			</if>
			UNION

			SELECT 0 AS total, COUNT(u.`id`) AS orderUser
			FROM yeshi_ec_user u
			<if test="channel != null and channel != 'all' ">
			LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a
			WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON u.`id`=a.uid
			<select id="getWeekHasOrder" resultType="java.util.HashMap">
			SELECT COUNT(DISTINCT hb.uid) AS showValue,FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate'
			FROM (SELECT COUNT(v2.`hb_id`) AS num,v2.hb_uid AS uid
			FROM yeshi_ec_hongbao_v2 v2
			WHERE (v2.`hb_type`=1 OR v2.`hb_type`=20)
			AND DATE_FORMAT(v2.`hb_create_time`,'%Y-%m-%d') <![CDATA[ >= ]]>'${startTime}'
			AND DATE_FORMAT(v2.`hb_create_time`,'%Y-%m-%d') <![CDATA[ <= ]]>'${endTime}'
			GROUP BY v2.hb_uid HAVING num >= ${orderNum})hb
			LEFT JOIN yeshi_ec_user u ON u.id = hb.uid
			<if test="channel != null and channel != 'all' ">
			LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a
			WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON u.`id`=a.uid
			</if>
			WHERE FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = '${startTime}'
			<if test="channel != null and channel != 'all' ">
			AND a.uid is not null
			</if>
			WHERE FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') = '${startTime}'
			AND u.id = ANY(SELECT hh.hb_uid FROM (SELECT COUNT(t.`hb_id`) AS num,t.hb_uid
			FROM yeshi_ec_hongbao_v2 t
			WHERE <![CDATA[DATE_FORMAT(t.`hb_create_time`,'%Y-%m-%d') >= '${startTime}']]>
			AND <![CDATA[DATE_FORMAT(t.`hb_create_time`,'%Y-%m-%d') < '${endTime}']]>
			GROUP BY t.hb_uid HAVING num >= ${orderNumber}
			)hh
			)

			<if test="channel != null and channel != 'all' ">
			AND a.uid is not null
			</if>
			)w

			GROUP BY FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d')
			ORDER BY u.`createtime`
			</select>

			<select id="getInfoByPhoneOrInviteCode" resultMap="BaseResultMap">
			SELECT * FROM yeshi_ec_user u
			LEFT JOIN yeshi_ec_user_info_extra uf ON uf.`uie_uid` = u.`id`
			WHERE uf.`uie_invite_code` IS NOT NULL
			AND (u.`phone` =#{phone} OR uf.`uie_invite_code` = #{inviteCode})
			LIMIT 1
			</select>
			</mapper>