品牌

yujian

2019-09-17 2a99c607e5c7dc640d3608b35a20b451e42922c3

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -183,8 +183,9 @@
            data.put("userRank", gson.toJson(userRank));

            data.put("dailySign", dailySignVO);

         }



         for (IntegralTaskClassVO taskClassVO : list) {

         for(int i = 0; i < list.size(); i++) {

            IntegralTaskClassVO taskClassVO = list.get(i);

				
            UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();

            

            // 邀请好友：是否激活邀请码

@@ -233,18 +234,27 @@
               taskClassVO.setLightUp(true);

            }



            Integer dateType = 1; // 查询当日

            if (uniqueKey == UniqueKeyEnum.orderReward)

               dateType = null; // 查询历史



            Long id = taskClassVO.getId();

				
            int countFinished = 0;

            Integer totalGoldCoin = integralTaskRecordService.getTotalGoldCoin(uid, id, dateType);

            Long id = taskClassVO.getId();

            // 查询当日

            Integer totalGoldCoin = integralTaskRecordService.getTotalGoldCoin(uid, id, 1);

            if (totalGoldCoin != null && totalGoldCoin > 0) {

               taskClassVO.setFinishedCoin("+" + totalGoldCoin);

               if (uniqueKey != UniqueKeyEnum.dailySign)

                  countFinished = integralTaskRecordService.countFinished(uid, id, dateType);

               if (uniqueKey != UniqueKeyEnum.dailySign && uniqueKey != UniqueKeyEnum.accountMaintain) {

                  countFinished = integralTaskRecordService.countFinished(uid, id, 1);

               }

            }

				
            if (uniqueKey == UniqueKeyEnum.accountMaintain) {

               countFinished = integralTaskRecordService.countFinished(uid, id, null); // 查询历史

            }

				
            /*

             * // 完善信息完成后，列表中消失 if (uniqueKey == UniqueKeyEnum.accountMaintain && taskNum ==

             * countFinished) { list.remove(i); i --; continue; }

             */

				
            progress = progress.replace("{已完成}", countFinished + "").replace("{总任务}", taskNum + "");



            if (signState == 0 && uniqueKey == UniqueKeyEnum.dailySign) {

@@ -276,10 +286,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) {

@@ -332,24 +339,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()));