Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

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

@@ -1636,14 +1636,8 @@


            listswiper = swiperPictureService.getByBannerCard(swiperCard);



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

               for (SwiperPicture swiperPicture : listswiper) {

                  swiperPicture.setBannerId(null);

                  swiperPicture.setCreatetime(null);

                  swiperPicture.setUpdatetime(null);

                  swiperPicture.setState(null);

                  swiperPicture.setRemark(null);

               }

            if (listswiper == null) {

               listswiper =  new ArrayList<SwiperPicture>();

            }



         } catch (Exception e) {

@@ -1661,12 +1655,6 @@


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

               for (Special special : listSpecial) {

                  special.setCreatetime(null);

                  special.setUpdatetime(null);

                  special.setState(null);

                  special.setRemark(null);

                  special.setCard(null);

                  special.setCardId(null);



                  if ("限时秒杀".equals(special.getName())) {

                     miaoShaSpecial = special;

@@ -1680,6 +1668,7 @@
                     // 其他专题

                     specialList.add(special);

                  }

						
               }

            }



@@ -1713,10 +1702,12 @@
      }



      JSONObject root = new JSONObject();

      root.put("banner", listswiper);

      root.put("honest", honestList);

      root.put("special", specialList);

		
      root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper));

      root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList));

      root.put("special", JsonUtil.getApiCommonGson().toJson(specialList));

      root.put("miaoSha", msJSON);

		


      // 增加邀请有奖

      JSONObject invite = new JSONObject();

@@ -2258,43 +2249,12 @@
         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,

               system.getId());



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

            for (Special special : listSpecial) {

               special.setCreatetime(null);

               special.setUpdatetime(null);

               special.setState(null);

               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) {

                * 
                * UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); if

                * (userInfoExtra != null && userInfoExtra.getInviteCode() != null &&

                * userInfoExtra.getInviteCode().trim().length() > 0) {

                * 
                * JSONObject params = new JSONObject(); params.put("url",

                * configService.get("invite_activation_success_url"));

                * special.setParams(params.toString()); } }

                */

					
            }

         } 
			
         if (listSpecial == null) {

            listSpecial = new ArrayList<Special>();

         }



         JSONObject root = new JSONObject();

         root.put("special", listSpecial);

         root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));

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

         

      } catch (Exception e) {