免单商品的红包处理

admin

2019-02-27 309a22d0624e8fec46f4b6722ed6135fe0a2ea3d

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -238,7 +238,7 @@
   

   @Resource

   private UserInfoExtraService userInfoExtraService;

	



   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {

@@ -2220,9 +2220,8 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



	
   /**

    *  活动列表

    * 活动列表

    * 

    * @param acceptData

    * @param out

@@ -2235,13 +2234,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) {

@@ -2251,13 +2250,12 @@
               special.setRemark(null);

               special.setCard(null);

               special.setCardId(null);

					


               JumpDetailV2 jumpDetail = special.getJumpDetail();

               if (jumpDetail != null) {

                  jumpDetail.setId(null);

                  jumpDetail.setName(null);

               }

					
               // 邀请登陆验证

               if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()

                     && uid != null) {