From d1dccd08a249b830a95eeeb04af25f87d5c056be Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 03 九月 2019 11:13:04 +0800 Subject: [PATCH] 金币明细bug --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 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..6cc4ccc 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(); @@ -231,8 +233,9 @@ taskClassVO.setLightUp(true); } - Integer dateType = 1; // 鏌ヨ褰撴棩 - if (uniqueKey == UniqueKeyEnum.orderReward) + // 鏌ヨ褰撴棩 + Integer dateType = 1; + if (uniqueKey == UniqueKeyEnum.orderReward || uniqueKey == UniqueKeyEnum.accountMaintain) dateType = null; // 鏌ヨ鍘嗗彶 Long id = taskClassVO.getId(); -- Gitblit v1.8.0