yujian
2019-07-01 875ebe574ec621ce72e3919319cc9df2fcd788ba
产生淘礼金创建记录的新人区分BUG修改
5个文件已修改
39 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinRecordMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinRecordMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -152,17 +152,15 @@
            page = 1;
        }
        long count = 0;
        int pageSize = Constant.PAGE_SIZE;
        List<UserTaoLiJinRecordVO> list = userTaoLiJinRecordService.getRecordByUid((page - 1) * pageSize, pageSize,    uid);
        if (list == null) {
            list = new ArrayList<UserTaoLiJinRecordVO>();
        } else if (list.size() > 0) {
            count = userTaoLiJinRecordService.countRecordByUid(uid);
        }
        
        long count = userTaoLiJinRecordService.countShareRecordByUid(uid);
        GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
        gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
            @Override
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinRecordMapper.java
@@ -20,6 +20,15 @@
    
    long countRecordByUid(@Param("uid")Long uid);
    
    /**
     * 统计分析记录条数
     * @param uid
     * @return
     */
    long countShareRecordByUid(@Param("uid")Long uid);
    /**
     * 今日创建分享红包个数
     * @param uid
fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinRecordMapper.xml
@@ -44,6 +44,12 @@
 
  <select id="countRecordByUid" resultType="Long">
      SELECT IFNULL(COUNT(d.`utlj_id`),0) FROM yeshi_ec_user_taolijin_record d
    WHERE d.`utlj_uid` = #{uid}
  </select>
 <select id="countShareRecordByUid" resultType="Long">
      SELECT IFNULL(COUNT(d.`utlj_id`),0) FROM yeshi_ec_user_taolijin_record d
    WHERE d.`utlj_uid` = #{uid} AND d.utlj_use_type = 2
  </select>
 
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -476,6 +476,12 @@
    }
    @Override
    public long countShareRecordByUid(Long uid) {
        return userTaoLiJinRecordMapper.countShareRecordByUid(uid);
    }
    @Override
    public long countTodayNum(Long uid) {
        return userTaoLiJinRecordMapper.countTodayNum(uid);
    }
fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java
@@ -34,6 +34,13 @@
     */
    public List<UserTaoLiJinRecordVO> getRecordByUid(long start, int count, Long uid);
    /**
     * 统计创建记录条数
     * @param uid
     * @return
     */
    public long countShareRecordByUid(Long uid);
    /**
     * 统计创建次数
@@ -89,4 +96,7 @@
     */
    public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
            throws UserTaoLiJinRecordException;
}