提现自动绑定修改

admin

2019-09-09 0922bfdb56bc30125d6fc8e13c50cdda7cd9dc72

 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();

@@ -274,10 +277,7 @@
         return;

      }



      int count = 5;

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

         count = Integer.MAX_VALUE;

      }

      int count = Integer.MAX_VALUE;



      List<IntegralTaskRecord> list = integralTaskRecordService.listNotReceived(count, uid);

      if (list == null) {

@@ -330,24 +330,8 @@
            return;

         }

         Integer goldCoin = integralTaskRecordService.receiveGoldCoin(uid, idList);

         Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {

         }.getType());

         List<IntegralTaskRecord> list = null;

         if (gidList != null && gidList.size() > 0) {

            list = integralTaskRecordService.listNotReceivedExcludeId(5 - gidList.size(), uid, gidList);

         } else {

            list = integralTaskRecordService.listNotReceivedExcludeId(5, uid, null);

         }



         if (list == null) {

            list = new ArrayList<IntegralTaskRecord>();

         }

         GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

         Gson gson2 = gsonBuilder.create();



         JSONObject data = new JSONObject();

         data.put("goldCoin", goldCoin);

         data.put("list", gson2.toJson(list));

         out.print(JsonUtil.loadTrueResult(data));

      } catch (IntegralTaskRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));