yujian
2019-06-26 020d940ae4e16f55f69cef3dd4c8dc0b9764af07
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2237,9 +2237,9 @@
         // 用户剩余可以淘礼金验证
         UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
         if (userMoneyExtra == null ||  userMoneyExtra.getTlj() == null) {
            data.put("userHongbao", new BigDecimal(0).setScale(2));
            data.put("userHongbao", new BigDecimal(0).setScale(2).toString());
         } else {
            data.put("userHongbao", userMoneyExtra.getTlj().setScale(2));
            data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());
         }
         
         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");
@@ -2479,17 +2479,20 @@
      }
      try {
         List<Special> list = new ArrayList<Special>();
         // 专题活动
         String specialCard = "special_activities";
         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
               system.getId());
         if (listSpecial == null) {
            listSpecial = new ArrayList<Special>();
         if (listSpecial != null) {
            list.addAll(listSpecial);
         }
         
         for (Special special: listSpecial) {
         for (int i = 0; i < list.size(); i++) {
            Special special = list.get(i);
            
            JumpDetailV2 jumpDetail = special.getJumpDetail();
            if (jumpDetail != null) {
@@ -2503,20 +2506,21 @@
               continue;
            }
            
            if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
               continue;
            }
            // 是否需要弹出框
            if (name.equals("账户等级特权")) { 
               if (uid != null) {
                  special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
               if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
                  list.remove(i);
                  i--;
               } else {
                  if (uid != null) {
                     special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
                  }
               }
            }
         }
         JSONObject root = new JSONObject();
         root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
         root.put("special", JsonUtil.getApiCommonGson().toJson(list));
         out.print(JsonUtil.loadTrueResult(root));
      } catch (Exception e) {