订单bug，分享爆款自购修改

admin

2019-07-11 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9

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

@@ -41,6 +41,7 @@
import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.ShamUser;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.common.JumpDetail;

import com.yeshi.fanli.entity.common.JumpDetailV2;

@@ -52,6 +53,7 @@
import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TLJBuyGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

@@ -80,6 +82,9 @@
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;

import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.goods.recommend.HomeRecommendGoodsService;

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;

import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

@@ -89,16 +94,22 @@
import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

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.service.inter.user.UserMoneyExtraService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -112,7 +123,10 @@
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.taobao.TaoLiJinUtil;

import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.tlj.SpreadHongBao;

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.sf.json.JSONArray;

@@ -229,6 +243,33 @@


   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



   @Resource

   private UserMoneyExtraService userMoneyExtraService;



   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;



   @Resource

   private ConfigTaoLiJinService configTaoLiJinService;



   @Resource

   private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;



   @Resource

   private DeviceSexService deviceSexService;



   @Resource

   private UserTaoLiJinRecordService userTaoLiJinRecordService;



   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   @Resource

   private HomeRecommendGoodsService homeRecommendGoodsService;



   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -1254,16 +1295,16 @@
       * 防止请求频率过高

       * 

       */

      if (Constant.IS_OUTNET) {

         String key = "linkParse-" + acceptData.getDevice() + "-" + id;

      // if (Constant.IS_OUTNET) {

      String key = "linkParse-" + acceptData.getDevice() + "-" + id;



         String value = redisManager.getCommonString(key);

         if (!StringUtil.isNullOrEmpty(value)) {

            out.print(JsonUtil.loadFalseResult(11, "请求频率限制"));

            return;

         }

         redisManager.cacheCommonString(key, "1", 5);// 5s间隔

      String value = redisManager.getCommonString(key);

      if (!StringUtil.isNullOrEmpty(value)) {

         out.print(JsonUtil.loadFalseResult(11, "请求频率限制"));

         return;

      }

      redisManager.cacheCommonString(key, "1", 5);// 5s间隔

      // }

      TaoBaoGoodsBrief goods = null;

      try {

         goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));

@@ -1298,6 +1339,54 @@
      int pageSize = Constant.PAGE_SIZE;

      JSONArray array = new JSONArray();

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();

      if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion())) {

         List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),

               imei, idfa, page);



         BigDecimal rate = hongBaoManageService.getFanLiRate();

         for (TaoBaoGoodsBrief goods : goodsList) {

            TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null);

            if (page < 3)

               extra.setRecommend(true);



            try {

               array.add(gson.toJson(extra));

            } catch (Exception e) {

               e.printStackTrace();

               System.out.println(new Gson().toJson(goods));

            }

         }



         if (page == 1) {

            List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());

            if (list != null && list.size() > 0)

               for (int i = list.size() - 1; i >= 0; i--) {

                  TLJBuyGoods goods = list.get(i);

                  TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods.getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);

                  String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                  TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();

                  vo.setLeft(goods.getLeftHongBaoCount());

                  vo.setMoney(hongBao);

                  vo.setTagName("付款立减 " + hongBao);

                  vo.setTip("");

                  vo.setTotal(goods.getTotalHongBaoCount());

                  extra.setTljBuyHongBao(vo);

                  extra.setPictureTag(new ClientTextStyleVO("立减TOP" + (i + 1), "#E5005C", "#FCE431", null));

                  extra.setRecommend(true);

                  extra.setSpreadMoney(vo.getTagName());

                  array.add(0, gson.toJson(extra));

               }

         }



         JSONObject data = new JSONObject();

         data.put("data", array);

         data.put("count", 1000);

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

         return;

      }



      // 从推荐来

      if (page <= 1) {

         array.clear();

@@ -1311,18 +1400,31 @@
               // 筛选

               List<TaoBaoGoodsBriefExtra> goodsList = new ArrayList<>();



               // 设备推荐

               for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

                  if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                        && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {

               List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService

                     .filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());



                     TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,

                           proportion.toString(), "");

                     extra.setRecommend(true);

                     goodsList.add(extra);

                  }

               // filter

               try {



                  gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);

               } catch (Exception e) {

               }



               // 设备推荐

               if (gList != null)

                  for (TaoBaoGoodsBrief goods : gList) {

                     if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                           && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                           && goods.getBiz30day() > 1000

                           && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {



                        TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,

                              proportion.toString(), "");



                        extra.setRecommend(true);

                        goodsList.add(extra);

                     }

                  }

               try {

                  monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,

                        (int) (java.lang.System.currentTimeMillis() - startTime), "推荐数量:" + goodsList.size()));

@@ -1585,8 +1687,11 @@
   @RequestMapping(value = "getRecommendIndex")

   public void getRecommendIndex(AcceptData acceptData, Long uid, PrintWriter out) {

      try {

         // 获取设备定义性别

         int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());



         // 1、专题模块

         JSONObject root = specialService.listCacheSpecialToIndex(acceptData);

         JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);



         // 2、顶部轮播图

         List<SwiperPicture> topPicList = getSwiperByCard("index_top");

@@ -1790,13 +1895,9 @@
    * @param out

    */

   @RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)

   public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {

   public void getGoodsInfo(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {



      if ("0".equalsIgnoreCase(uid)) {

         uid = "";

      }



      if (StringUtil.isNullOrEmpty(id)) {

      if (id == null) {

         out.print(JsonUtil.loadFalseResult(1, "请上传id"));

         return;

      }

@@ -1840,14 +1941,14 @@


      if (!convertInServer) {

         try {

            goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(Long.parseLong(id));

            goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id);

            if (goods == null) {

               TaoKeAppInfo app = new TaoKeAppInfo();

               app.setAppKey(TaoBaoConstant.TAOBAO_COMMON_APPKEY);

               app.setAppSecret(TaoBaoConstant.TAOBAO_COMMON_APPSECRET);

               app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);

               app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);

               goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

               goods = TaoKeApiUtil.searchGoodsDetail(id, app);

               final TaoBaoGoodsBrief finalGoods = goods;

               if (goods != null) {

                  ThreadUtil.run(new Runnable() {

@@ -1862,7 +1963,7 @@
            // 商品下架

            ThreadUtil.run(new Runnable() {

               public void run() {

                  taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));

                  taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);

               }

            });



@@ -1879,7 +1980,7 @@
         app.setPid(clientPid);



         try {

            goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

            goods = TaoKeApiUtil.searchGoodsDetail(id, app);

            if (goods != null) {

               ticket.put("clickUrl", goods.getAuctionUrl());

               // 测试使用

@@ -1901,7 +2002,7 @@
         } catch (TaobaoGoodsDownException e) {

            ThreadUtil.run(new Runnable() {

               public void run() {

                  taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));

                  taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);

               }

            });

         }

@@ -1975,11 +2076,10 @@
      }



      // 判断收藏

      if (StringUtil.isNullOrEmpty(uid)) {

      if (uid == null) {

         data.put("collected", false);

      } else {

         CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),

               Long.parseLong(id));

         CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id);

         data.put("collected", collectionGoods != null ? true : false);

      }



@@ -2025,7 +2125,8 @@
               redisManager.saveCommonTaoToken(tb.getAuctionId(), token);

            }

         }

         tb.setCouponLinkTaoToken(token);

         if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))

            tb.setCouponLinkTaoToken(token);



         // 服务端转链

         // if (convertInServer &&

@@ -2041,7 +2142,11 @@
         couponInfo.put("couponTime", "使用期限：" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"

               + tb.getCouponEffectiveEndTime().replace("-", "."));

         // 券的口令

         couponInfo.put("couponToken", token);



         if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))

            couponInfo.put("couponToken", "");

         else

            couponInfo.put("couponToken", token);

         goodsJson.put("couponInfo", couponInfo);



         if (tb.getBiz30day() >= 1000) {

@@ -2107,26 +2212,22 @@
         goodsJson.put("shopInfo", tbShopInfo);

      }



      goodsJson.put("fanliValid", true);// 是否有返利



      // 分享路径

      String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());



      // 是否加入选品库： 0未加入 1 已加入

      boolean storageState = false;

      if (uid != null && uid.trim().length() > 0) {

         storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));

      if (uid != null) {

         storageState = userGoodsStorageService.isExistStorage(uid, id);

      }



      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);



      data.put("goods", goodsJson);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

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



      data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));

      String noRebateHelpLink = null;



      // 商品链接

      String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

@@ -2135,6 +2236,117 @@
         data.put("h5Url", HttpUtil.getShortLink(h5Url));

      } catch (Exception e) {

         data.put("h5Url", h5Url);

      }



      // 是否有返利

      boolean fanliValid = true;

      // 资金类型 1-返 2-奖

      int moneyType = 1;



      // 推广红包

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

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);



         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {

            out.print(JsonUtil.loadFalseResult(2, "商品不存在"));

            return;

         }



         // 是否为新用户

         boolean isNewUser = userInfoExtraService.isNewUser(uid);

         if (isNewUser) {

            // 判定为老用户： 新人只要使用了新人红包，也就是那1块钱，那么，他看到的分享爆款中的商品-就只能分享。

            long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);

            if (countRecord > 0) {

               isNewUser = false;

            }

         }



         SpreadHongBao spreadHongBao = new SpreadHongBao();

         if (isNewUser) {

            spreadHongBao.setMoney("1");

         } else {

            spreadHongBao.setMoney(spreadMoney.toString());



            moneyType = 2;

            fanliValid = false;

            ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();

            textStyleVO1.setContent("分享");

            textStyleVO1.setColor("#666666");

            ClientTextStyleVO textStyleVO2 = new ClientTextStyleVO();

            textStyleVO2.setContent("赚奖金");

            textStyleVO2.setColor("#F14242");

            ClientTextStyleVO textStyleVO3 = new ClientTextStyleVO();

            textStyleVO3.setContent("，好友");

            textStyleVO3.setColor("#666666");

            ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();

            textStyleVO4.setContent("领红包！");

            textStyleVO4.setColor("#F14242");



            List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();

            listText.add(textStyleVO1);

            listText.add(textStyleVO2);

            listText.add(textStyleVO3);

            listText.add(textStyleVO4);



            data.put("listTip", listText);

         }

         spreadHongBao.setTip("当日领取，当日内使用，过期失效");

         goodsJson.put("spreadHongBao", spreadHongBao);



         // 用户剩余可以淘礼金验证

         UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);

         if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {

            data.put("userHongbao", new BigDecimal(0).setScale(2).toString());

         } else {

            data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());

         }



         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");



         if (Constant.IS_TEST) {

            fanliValid = true;

            goodsJson.put("shareValid", false);

            JSONObject tljNum = new JSONObject();

            tljNum.put("percent", "80");

            tljNum.put("num", "8825");

            goodsJson.put("tljNum", tljNum);

         }



      } else if (from != null && from.equals("taolijin_buy")) {

         noRebateHelpLink = configService.get("zigoulijian_nofanli_help");

         // 查询分享库

         TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),

               TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));

         if (buyGoods == null) {

            out.print(JsonUtil.loadFalseResult(2, "自购立减红包过期"));

            return;

         }



         fanliValid = true;

         goodsJson.put("shareValid", false);

         String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();

         TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();

         vo.setLeft(buyGoods.getLeftHongBaoCount());

         vo.setMoney(tljHongBao);

         vo.setTagName("付款立减 ¥" + tljHongBao);

         vo.setTip("当日领取，当日内使用，过期失效");

         vo.setTotal(buyGoods.getTotalHongBaoCount());

         goodsJson.put("tljBuyHongBao", vo);

         moneyType = 2;

      }



      goodsJson.put("moneyType", moneyType);

      goodsJson.put("fanliValid", fanliValid);

      data.put("goods", goodsJson);



      if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {

         data.put("noRebateHelpLink", noRebateHelpLink);

      } else {

         data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));

      }



      // 取消分享活动

@@ -2157,15 +2369,12 @@


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



      final String tempUid = uid;

      final TaoBaoGoodsBrief goodsInfo = tb;

      ThreadUtil.run(new Runnable() {

         public void run() {

            // 添加浏览记录

            try {

               scanHistoryV2Service.addScanHistory(

                     StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),

                     goodsInfo);

               scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(), goodsInfo);

            } catch (Exception e) {

               e.printStackTrace();

            }

@@ -2266,69 +2475,32 @@
         e1.printStackTrace();

      }



      if (goodsList != null)

      if (goodsList != null && goodsList.size() > 0)

         goodsList.parallelStream().forEach(goods -> {

            if (goods != null) {

               // 获取详情

               TaoBaoGoodsBrief taoBaoGoodsBrief = null;

               try {

                  taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());

               } catch (Exception e) {

                  e.printStackTrace();

               }



            // 获取详情

            TaoBaoGoodsBrief taoBaoGoodsBrief = null;

            try {

               taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());

            } catch (Exception e) {

               e.printStackTrace();

               if (taoBaoGoodsBrief == null) {

                  TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

                  goods.setCouponInfo(newGoods.getCouponInfo());

                  goods.setCouponLink(newGoods.getCouponLink());

                  goods.setTkRate(newGoods.getTkRate());

                  taoBaoGoodsBrief = goods;

               }



               if (taoBaoGoodsBrief != null) {

                  listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));

               }

            }



            if (taoBaoGoodsBrief == null) {

               TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

               goods.setCouponInfo(newGoods.getCouponInfo());

               goods.setCouponLink(newGoods.getCouponLink());

               goods.setTkRate(newGoods.getTkRate());

               taoBaoGoodsBrief = goods;

            }



            if (taoBaoGoodsBrief != null) {

               listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));

            }



         });



      List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();

      // 删除推荐

      //

      // try {

      // List<QualityFactory> listRecommend =

      // qualityGoodsService.recommendByAuctionId(id);

      //

      // if (listRecommend != null && listRecommend.size() > 1) {

      // for (QualityFactory quality : listRecommend) {

      //

      // TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

      // if (taoBaoGoodsBrief == null) {

      // continue;

      // }

      //

      // int biz30day = taoBaoGoodsBrief.getBiz30day();

      // if (biz30day >= 10000) {

      // double sales = biz30day;

      // String salesCountMidea = String.format("%.1f", sales / 10000);

      // taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

      // } else {

      // taoBaoGoodsBrief.setSalesCount(biz30day + "");

      // }

      //

      // // 改变图片尺寸

      // String pictUrl = taoBaoGoodsBrief.getPictUrl();

      // if (!StringUtil.isNullOrEmpty(pictUrl) &&

      // !pictUrl.contains("320x320")) {

      // taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

      // }

      //

      // listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

      // proportion.toString(), null));

      // }

      // }

      // } catch (Exception e2) {

      // e2.printStackTrace();

      // }



      // 取偶数个数据

      if (listExtra.size() % 2 != 0) {

@@ -2363,18 +2535,47 @@
      }



      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 (int i = 0; i < list.size(); i++) {

            Special special = list.get(i);



            JumpDetailV2 jumpDetail = special.getJumpDetail();

            if (jumpDetail != null) {

               jumpDetail.setNeedLogin(special.isJumpLogin());

               special.setJumpDetail(jumpDetail);

            }



            String name = special.getName();

            if (StringUtil.isNullOrEmpty(name)) {

               continue;

            }



            // 是否需要弹出框

            if (name.equals("账户等级特权")) {

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