admin
2019-01-29 2d634416cc026d139d515d53b6fa56f73d253458
Merge remote-tracking branch 'origin/master'
2个文件已修改
23 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1889,7 +1889,7 @@
     */
    @RequestMapping(value = "countMyTeam", method = RequestMethod.POST)
    public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
        try {
        long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
        long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
@@ -1925,7 +1925,6 @@
        
        
        boolean hasCode = false;
        try {
            String inviteCode = userInfoExtraService.getUserInviteCode(uid);
            if (inviteCode != null && inviteCode.trim().length() > 0) {
                hasCode = true;    // 已有邀请码
@@ -1933,12 +1932,17 @@
                // 邀请激活链接
                resultData.put("activationlink", configService.get("invite_activation_url"));
            }
        } catch (UserInfoExtraException e) {
            e.printStackTrace();
        }
        resultData.put("hasCode", hasCode);
        out.print(JsonUtil.loadTrueResult(resultData));
        } catch (UserInfoExtraException e) {
            out.print(JsonUtil.loadFalseResult(e.getMsg()));
        } catch (Exception e) {
            out.print(JsonUtil.loadFalseResult("统计失败"));
            e.printStackTrace();
        }
    }
    /**
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -11,7 +11,6 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
@@ -294,6 +293,14 @@
            throw new UserInfoExtraException(1, "用户id、邀请码不能为空");
        }
        
        UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
        if (extra != null) {
            String inviteCodeHas = extra.getInviteCode();
            if (inviteCodeHas != null && inviteCodeHas.trim().length() > 0) {
                throw new UserInfoExtraException(1, "已存在邀请码,请刷新页面");
            }
        }
        // 被邀请人信息
        UserInfo invitee = userInfoService.selectByPKey(uid);
        if (invitee == null) {