yujian
2019-09-03 d1dccd08a249b830a95eeeb04af25f87d5c056be
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();