yujian
2019-09-04 8a4bd3e7b3a05564a7b164413d02763734386de3
发布时间 改成 72小时有效
7个文件已修改
53 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/CodePublishRecordMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/integral/CodePublishRecord.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
@@ -244,7 +244,6 @@
     *            邀请嘛
     * @param out
     */
    @IntegralGetFrequencyLimit(key = "'activationInvite-'+#uid+'-'+#inviteCode", time = 30)
    @RequestMapping(value = "activationInvite")
    public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) {
        try {
@@ -282,7 +281,6 @@
     * @param out
     */
    @RequestMapping(value = "activationInviteWX")
    @IntegralGetFrequencyLimit(key = "'activationInviteWX-'+#uid+'-'+#code", time = 30)
    public void activationInviteWX(AcceptData acceptData, Long uid, String  code, PrintWriter out) {
        try {
            userInfoExtraService.activationInviteWX(uid, code);
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -277,10 +277,7 @@
            return;
        }
        int count = 5;
        if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
            count = Integer.MAX_VALUE;
        }
        int count = Integer.MAX_VALUE;
        List<IntegralTaskRecord> list = integralTaskRecordService.listNotReceived(count, uid);
        if (list == null) {
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/CodePublishRecordMapper.java
@@ -13,12 +13,11 @@
     * 查询近3天发布记录
     * @return
     */
    List<CodePublishRecord> listValid(@Param("start") long start, @Param("count") int count);
    List<CodePublishRecord> listValid(@Param("start") long start, @Param("count") int count, @Param("validTime")long validTime);
    
    
    long countValid();
    long countValid(@Param("validTime") long validTime);
    
    
    long countValidRecord(@Param("uid") long uid);
    long countValidRecord(@Param("uid") long uid, @Param("validTime") long validTime);
}
fanli/src/main/java/com/yeshi/fanli/entity/integral/CodePublishRecord.java
@@ -18,6 +18,9 @@
public class CodePublishRecord implements Serializable {
    private static final long serialVersionUID = 1L;
    // 发布有效时间
    public static final long VALIDTIME  = 3*24*60*60;
    @Expose
    @Column(name = "pr_id")
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>
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
@@ -37,14 +37,14 @@
    
    @Override
    public long countValidRecord(Long uid){
        return codePublishRecordMapper.countValidRecord(uid);
        return codePublishRecordMapper.countValidRecord(uid, CodePublishRecord.VALIDTIME);
    }
    
    
    @Override
    public List<CodePublishRecord> listValid(long start, int count) {
        
        List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count);
        List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count, CodePublishRecord.VALIDTIME);
        if (listValid == null || listValid.size() == 0) {
            return listValid;
        }
@@ -87,7 +87,7 @@
    @Override
    public long countValid() {
        return codePublishRecordMapper.countValid();
        return codePublishRecordMapper.countValid(CodePublishRecord.VALIDTIME);
    }
    
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
@@ -473,7 +473,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'bindWeiXin-'+#uid", time = 30)
    @Async()
    @Override
    public void addBindWeiXin(Long uid) {
@@ -485,7 +484,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'bindPhone-'+#uid", time = 30)
    @Async()
    @Override
    public void addBindPhone(Long uid) {
@@ -497,7 +495,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'bindTaoBao-'+#uid", time = 30)
    @Async()
    @Override
    public void addBindTaoBao(Long uid) {
@@ -509,7 +506,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'setWeiXinNum-'+#uid", time = 30)
    @Async()
    @Override
    public void addSetWeiXinNum(Long uid) {
@@ -521,7 +517,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'setGender-'+#uid", time = 30)
    @Async()
    @Override
    public void addSetGender(Long uid) {
@@ -533,7 +528,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'setPortrait-'+#uid", time = 30)
    @Async()
    @Override
    public void addSetPortrait(Long uid) {
@@ -545,7 +539,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'setNickName-'+#uid", time = 30)
    @Async()
    @Override
    public void addSetNickname(Long uid) {
@@ -557,7 +550,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'bindAlipay-'+#uid", time = 30)
    @Async()
    @Override
    public void addBindAlipay(Long uid) {
@@ -569,7 +561,6 @@
    }
    @IntegralGetVersionLimit(uid = "#uid")
    @IntegralGetFrequencyLimit(key = "'inviteActivate-'+#uid", time = 30)
    @Async()
    @Override
    public void addInviteActivate(Long uid) {