yujian
2020-05-14 e33f868ce527b080b470ec89bee0f33e25dea960
粉丝信息统计
2个文件已修改
6 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -1106,7 +1106,6 @@
        // 上级
        UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
        
        JSONArray tagArray = new JSONArray();
        String memoName = user.getNickName();
@@ -1200,11 +1199,12 @@
        if (directNum > 0) {
            indirectNum = threeSaleSerivce.countSecondTeam(workerId);
        }
        // 订单统计
        long countTB = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_TAOBAO, 60);
        long countJD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_JD, 60);
        long countPDD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_PDD, 60);
        data.put("fansNum", "直接粉丝: "+directNum+"人\n" + "间接粉丝: "+indirectNum+"人");
        data.put("orderInfo", "淘宝 ("+countTB+"笔)\n" + "京东 ("+countJD+"笔)\n" + "拼多多 ("+countPDD+"笔)");
        out.print(JsonUtil.loadTrueResult(data));
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
@@ -153,7 +153,7 @@
            
            if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime())) {
                Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinActiveTime());
                list.add(Criteria.where("joinTime").gte(date));
                list.add(Criteria.where("activeTime").gte(date));
            }
            if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime())) {