yujian
2019-01-29 6b31dd8398fadda38d785ad7190151cb06aa9bd6
队员-邀请码状态返回+邀请消息
2个文件已修改
95 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1832,52 +1832,71 @@
    @RequestMapping(value = "getMyTeam", method = RequestMethod.POST)
    public void getMyTeam(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {
        int pageSize = Constant.PAGE_SIZE;
        try {
            int pageSize = Constant.PAGE_SIZE;
            JSONObject resultData = new JSONObject();
            if (type == 1) {
                resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
            } else if (type == 2) {
                resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
            }
        JSONObject resultData = new JSONObject();
        if (type == 1) {
            resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
        } else if (type == 2) {
            resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
        }
            // 安卓系统返回所有数据
            String platform = acceptData.getPlatform();
            if ("android".equalsIgnoreCase(platform)) {
                long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
                long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
        // 安卓系统返回所有数据
        String platform = acceptData.getPlatform();
        if ("android".equalsIgnoreCase(platform)) {
            long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
            long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
                long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
                long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
            long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
            long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
                JSONObject bossData = null;
                ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
                if (threeSale != null) {
                    bossData = new JSONObject();
                    UserInfo boss = threeSale.getBoss();
                    if (boss != null) {
                        bossData.put("nickName", boss.getNickName());
                        bossData.put("portrait", boss.getPortrait());
                    }
            JSONObject bossData = null;
            ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
            if (threeSale != null) {
                bossData = new JSONObject();
                UserInfo boss = threeSale.getBoss();
                if (boss != null) {
                    bossData.put("nickName", boss.getNickName());
                    bossData.put("portrait", boss.getPortrait());
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
                    Long createTime = threeSale.getCreateTime();
                    Date inviteTime = new Date(createTime);
                    bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));
                }
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
                Long createTime = threeSale.getCreateTime();
                Date inviteTime = new Date(createTime);
                bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));
            }
                String helpLink = configService.get("team_help_url");
                if (helpLink == null) {
                    helpLink = "";
                }
            String helpLink = configService.get("team_help_url");
            if (helpLink == null) {
                helpLink = "";
                boolean hasCode = false;
                String inviteCode = userInfoExtraService.getUserInviteCode(uid);
                if (inviteCode != null && inviteCode.trim().length() > 0) {
                    hasCode = true; // 已有邀请码
                } else {
                    // 邀请激活链接
                    resultData.put("activationlink", configService.get("invite_activation_url"));
                }
                resultData.put("hasCode", hasCode);
                resultData.put("helpLink", helpLink);
                resultData.put("firstTeam", firstTeam);
                resultData.put("firstTeamTotal", firstTeamTotal);
                resultData.put("secondTeam", secondTeam);
                resultData.put("secondTeamTotal", secondTeamTotal);
                resultData.put("boss", bossData);
            }
            resultData.put("helpLink", helpLink);
            resultData.put("firstTeam", firstTeam);
            resultData.put("firstTeamTotal", firstTeamTotal);
            resultData.put("secondTeam", secondTeam);
            resultData.put("secondTeamTotal", secondTeamTotal);
            resultData.put("boss", bossData);
            out.print(JsonUtil.loadTrueResult(resultData));
        } catch (UserInfoExtraException e) {
            out.print(JsonUtil.loadFalseResult(e.getMsg()));
        } catch (Exception e) {
            out.print(JsonUtil.loadFalseResult("统计失败"));
            e.printStackTrace();
        }
        out.print(JsonUtil.loadTrueResult(resultData));
    }
    /**
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -635,6 +635,8 @@
            // 删除已失效关系
            threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
        }
        // 邀请消息
        userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
    }