推送修改

admin

2019-03-06 be16d59fa5dafed5d4029539ea9618a94aa32e19

 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,16 +1702,18 @@
      }



      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();

      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");

      invite.put("jumpDetail", jumpDetail);

      invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");

      invite.put("picture", configService.get("home_invite_banner"));



      if ("ios".equalsIgnoreCase(acceptData.getPlatform())

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

@@ -1988,7 +1979,7 @@
         

         if (from != null && from.equals("miandan")) {

            // 免单商品

            hongBao = quanPrice.toString();

            hongBao = "¥" + quanPrice.toString();

         }

         

         

@@ -2065,18 +2056,18 @@
      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);



      



      if (!StringUtil.isNullOrEmpty(uid)

            && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

      } else if(!"miandan".equals(from)) {

         // 非免单商品

         JSONObject shareActivity = new JSONObject();

         shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

               new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

         shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");

			
         data.put("shareActivity", shareActivity);

      } 
//      取消分享活动

//      if (!StringUtil.isNullOrEmpty(uid)

//            && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

//      } else if(!"miandan".equals(from)) {

//         // 非免单商品

//         JSONObject shareActivity = new JSONObject();

//         shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

//               new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

//         shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");

//			
//         data.put("shareActivity", shareActivity);

//      } 
      

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



@@ -2258,40 +2249,14 @@
         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) {

         e.printStackTrace();

      }