From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 27 八月 2019 16:09:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java index 15790fc..4f00016 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java @@ -186,14 +186,16 @@ for (IntegralTaskClassVO taskClassVO : list) { UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey(); - - UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid); - if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) { - JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate", - Constant.getPlatformCode(acceptData.getPlatform()), - Integer.parseInt(acceptData.getVersion())); - - taskClassVO.setJumpDetail(jumpDetailV2); + + // 閭�璇峰ソ鍙嬶細鏄惁婵�娲婚個璇风爜 + if (uniqueKey == UniqueKeyEnum.inviteTeam) { + UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid); + if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) { + JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate", + Constant.getPlatformCode(acceptData.getPlatform()), + Integer.parseInt(acceptData.getVersion())); + taskClassVO.setJumpDetail(jumpDetailV2); + } } String progress = taskClassVO.getProgress(); -- Gitblit v1.8.0