From 25941582a2c5c731b0ce413fa40f5495a1e8f0c2 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 04 九月 2019 11:05:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml index 05be7c0..8ae6455 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml @@ -44,23 +44,22 @@ </update> <select id="listValid" resultMap="BaseResultVOMap"> - SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code` FROM yeshi_ec_code_publish_record p - LEFT JOIN `yeshi_ec_user` u ON u.`id` = p.`pr_uid` - LEFT JOIN `yeshi_ec_user_info_extra` e ON e.`uie_uid` = p.`pr_uid` - WHERE DATE_SUB(CURDATE(), INTERVAL 3 DAY) <![CDATA[<]]> DATE(p.`pr_create_time`) - ORDER BY p.`pr_create_time` DESC - LIMIT #{start},#{count} + SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code` FROM yeshi_ec_code_publish_record p + LEFT JOIN `yeshi_ec_user` u ON u.`id` = p.`pr_uid` + LEFT JOIN `yeshi_ec_user_info_extra` e ON e.`uie_uid` = p.`pr_uid` + WHERE TIMESTAMPDIFF(SECOND,p.`pr_create_time`,NOW())<![CDATA[<]]> #{validTime} + ORDER BY p.`pr_create_time` DESC + LIMIT #{start},#{count} </select> <select id="countValid" resultType="Long"> - SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record - WHERE DATE_SUB(CURDATE(), INTERVAL 3 DAY) <![CDATA[<]]> DATE(pr_create_time) + SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record + WHERE TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]> #{validTime} </select> <select id="countValidRecord" resultType="Long"> - SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record - WHERE DATE_SUB(CURDATE(), INTERVAL 3 DAY) <![CDATA[<]]> DATE(pr_create_time) - AND pr_uid = #{uid} + SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record + WHERE pr_uid = #{uid} AND TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]> #{validTime} </select> </mapper> -- Gitblit v1.8.0