admin
2019-02-26 073d2e0dd261bae87d8f26092988dc176c940eaa
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -102,6 +102,7 @@
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -233,6 +234,9 @@
   @Resource
   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
   @Resource
   private UserInfoExtraService userInfoExtraService;
   @RequestMapping(value = "getrecommendsection")
   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -2214,9 +2218,8 @@
      out.print(JsonUtil.loadTrueResult(data));
   }
   /**
    *  活动列表
    * 活动列表
    * 
    * @param acceptData
    * @param out
@@ -2229,13 +2232,13 @@
         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));
         return;
      }
      try {
         // 专题活动
         String specialCard = "special_activities";
         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE,
               specialCard, system.getId());
         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
               system.getId());
         if (listSpecial != null && listSpecial.size() > 0) {
            for (Special special : listSpecial) {
@@ -2245,12 +2248,19 @@
               special.setRemark(null);
               special.setCard(null);
               special.setCardId(null);
               // 手动替换参数
               if (special.getName() != null && special.getName().contains("邀请")) {
//                  userInfoExtraService
               }
               JumpDetailV2 jumpDetail = special.getJumpDetail();
               if (jumpDetail != null) {
                  jumpDetail.setId(null);
                  jumpDetail.setName(null);
               }
            }
         }