券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

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

@@ -7,7 +7,6 @@
import java.util.Calendar;

import java.util.Collections;

import java.util.Date;

import java.util.Iterator;

import java.util.List;



import javax.annotation.Resource;

@@ -61,6 +60,7 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.goods.ScanHistoryException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.exception.user.UserCustomSettingsException;

@@ -102,6 +102,7 @@
import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

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

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

@@ -216,6 +217,9 @@
   @Resource

   private QualityFlashSaleService qualityFlashSaleService;

   



   @Resource

   private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -1567,24 +1571,33 @@
   @RequestMapping(value = "getRecommendIndex")

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

      try {

         // 专题模块

         JSONObject root = specialService.listCacheSpecialToIndex();

         //  1、专题模块

         JSONObject root = specialService.listCacheSpecialToIndex(acceptData);



         // 顶部轮播图

         // 2、顶部轮播图

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

         if (topPicList == null) {

            topPicList = new ArrayList<SwiperPicture>();

         }

         root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));

         

         // 邀请、分享轮播图

         List<SwiperPicture> invitePicList = getInvitePicList(uid, acceptData);

			
         // 3、邀请有奖

         List<SwiperPicture> invitePicList = null;

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

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

            // 如果IOS当前版本处于审核状态就不返回

         } else {

            invitePicList = getSwiperByCard("index_invite");	
         }

			
         if (invitePicList == null) {

            invitePicList = new ArrayList<SwiperPicture>();

         }

         } 
         root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));

         

         // 底部网页链接

			
         // 4、IOS的底部网页链接

         String platform = acceptData.getPlatform();

         if ("ios".equalsIgnoreCase(platform)) {

            root.put("htmlLink", configService.get("index_html_link_ios"));

@@ -1616,25 +1629,7 @@
      

      List<SwiperPicture> invitePicList = getSwiperByCard("index_invite");   

      

      if (uid != null) {

         try {

            // 用户自定义：不看邀请有奖

            UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

            if (vo != null  && vo.getNoInvitationBonus() != null && vo.getNoInvitationBonus() == 1 
                  && invitePicList != null && invitePicList.size() > 0) {

               Iterator<SwiperPicture> iterator = invitePicList.iterator();

               while (iterator.hasNext()) {

                  SwiperPicture swiperPicture = iterator.next();

                  JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();

                  if (jumpDetail != null && "invite".equals(jumpDetail.getType())) {

                     iterator.remove();

                  }

               }

            }

         } catch (UserCustomSettingsException e) {

            e.printStackTrace();

         }

      }

		
      

      return invitePicList;

   }

@@ -1700,16 +1695,24 @@
      nextTime.set(Calendar.SECOND, 0);

      nextTime.set(Calendar.MILLISECOND, 0);

      

      JSONObject root = new JSONObject();

      root.put("time", nextTime.getTimeInMillis());

	
      JSONArray array = null;

      String timekey = "spikeGoods_hour";

      String cachekey = "spikeGoodsList";

      

		
      JSONArray array = new JSONArray();

      String cachekey = "spikeGoodsList" ;

      String cacheValue = redisManager.getCommonString(cachekey);

      if (!StringUtil.isNullOrEmpty(cacheValue)) {

         array = JSONArray.fromObject(cacheValue);

      String timeValue = redisManager.getCommonString(timekey);

      if (timeValue == null || !timeValue.equals(hour+"")) {

         redisManager.cacheCommonString(timekey, hour+"", 60 * 30);

      } else {

         String cacheValue = redisManager.getCommonString(cachekey);

         if (!StringUtil.isNullOrEmpty(cacheValue)) {

            array = JSONArray.fromObject(cacheValue);

         }

      }

		
      if (array == null) {

         array = new JSONArray();

			
         BigDecimal proportion = manageService.getFanLiRate();

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

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

@@ -1719,6 +1722,7 @@
         if (listGoods == null) {

            listGoods = new ArrayList<QualityFactory>();

         }

			
         /* 遍历列表数据 */

         for (QualityFactory qualityFactory : listGoods) {

               

@@ -1728,9 +1732,13 @@
            }

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

         }

			
         // 缓存半个小时

         redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);

      }

		
      JSONObject root = new JSONObject();

      root.put("time", nextTime.getTimeInMillis());

      root.put("listgoods", array);

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

   }

@@ -1788,110 +1796,102 @@


      LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime));



      final String clientPid = clientTBPid.getPid();

      final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      // 是否在服务端进行转链

      boolean convertInServer = configService.isConvertTaoBaoLinkInServer();



      List<String> taskList = new ArrayList<>();

      // 获取商品基本信息

      taskList.add("goods");

      JSONObject ticket = new JSONObject();

      TaoBaoGoodsBrief goods = null;



      taskList.stream().parallel().forEach(task -> {

         if (task.equalsIgnoreCase("goods")) {

            JSONObject ticket = new JSONObject();

            TaoBaoGoodsBrief goods = null;



            if (!convertInServer) {



               try {

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

                  if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

                     String appId = clientPid.split("_")[2];

                     TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

                     TaoKeAppInfo app = new TaoKeAppInfo();

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

                     app.setAppKey(config.getAppKey());

                     app.setAppSecret(config.getAppSecret());

                     app.setPid(clientPid);

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

                     if (linkInfo != null) {

                        goods.setAuctionUrl(linkInfo.getAuctionUrl());

                        goods.setCouponLink(linkInfo.getCouponLink());

                        goods.setTkRate(linkInfo.getTkRate());

                     }

                  }

               } catch (TaobaoGoodsDownException e) {

                  // 商品下架

                  ThreadUtil.run(new Runnable() {

                     public void run() {

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

                     }

                  });



               }



            } else {

               String appId = clientPid.split("_")[2];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

      if (!convertInServer) {

         try {

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

            if (goods == null) {

               TaoKeAppInfo app = new TaoKeAppInfo();

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

               app.setAppKey(config.getAppKey());

               app.setAppSecret(config.getAppSecret());

               app.setPid(clientPid);



               try {

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

                  if (goods != null) {

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

                     // 测试使用

                     ticket.put("couponUrl", goods.getCouponLink());

                     data.put("ticket", ticket);

                  }



                  if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

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

                     if (linkInfo != null) {

                        goods.setAuctionUrl(linkInfo.getAuctionUrl());

                        goods.setCouponLink(linkInfo.getCouponLink());

                        goods.setTkRate(linkInfo.getTkRate());

                     }

                  }



               } catch (NumberFormatException e) {

                  e.printStackTrace();

               } catch (TaobaoGoodsDownException e) {

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

               final TaoBaoGoodsBrief finalGoods = goods;

               if (goods != null) {

                  ThreadUtil.run(new Runnable() {

                     @Override

                     public void run() {

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

                        taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(finalGoods);

                     }

                  });

               }



            }

         } catch (TaobaoGoodsDownException e) {

            // 商品下架

            ThreadUtil.run(new Runnable() {

               public void run() {

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

               }

            });



            if (goods != null) {

               goodsList.add(goods);

               final TaoBaoGoodsBrief newGoods = goods;

               ThreadUtil.run(new Runnable() {

                  public void run() {

                     try {

                        // 更新商品

                        LogHelper.test("更新商品详情:" + newGoods.getAuctionId());

                        taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods);

                     } catch (TaobaoGoodsUpdateException e) {



                     }

                  }

               });

            }

         }

      });



      } else {

         final String clientPid = clientTBPid.getPid();

         String appId = clientPid.split("_")[2];

         TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

         TaoKeAppInfo app = new TaoKeAppInfo();

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

         app.setAppKey(config.getAppKey());

         app.setAppSecret(config.getAppSecret());

         app.setPid(clientPid);



         try {

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

            if (goods != null) {

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

               // 测试使用

               ticket.put("couponUrl", goods.getCouponLink());

               data.put("ticket", ticket);

            }



            if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

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

               if (linkInfo != null) {

                  goods.setAuctionUrl(linkInfo.getAuctionUrl());

                  goods.setCouponLink(linkInfo.getCouponLink());

                  goods.setTkRate(linkInfo.getTkRate());

               }

            }



         } catch (NumberFormatException e) {

            e.printStackTrace();

         } catch (TaobaoGoodsDownException e) {

            ThreadUtil.run(new Runnable() {

               public void run() {

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

               }

            });

         }



      }



      if (goods != null) {

         goodsList.add(goods);

         final TaoBaoGoodsBrief newGoods = goods;

         ThreadUtil.run(new Runnable() {

            public void run() {

               try {

                  // 更新商品

                  LogHelper.test("更新商品详情:" + newGoods.getAuctionId());

                  taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods);

               } catch (TaobaoGoodsUpdateException e) {



               }

            }

         });

      }



      TaoBaoGoodsBrief tb = null;

      if (goodsList.size() > 0) {

         tb = goodsList.get(0);



      }



      if (tb == null) {

@@ -1909,17 +1909,19 @@
      for (String img : tb.getImgList()) {

         finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));

      }

      if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))

         finalImgList.add(0, tb.getPictUrlWhite());



      JSONObject goods = new JSONObject();

      goods.put("auctionId", tb.getAuctionId());

      goods.put("imgList", finalImgList);

      goods.put("title", tb.getTitle());

      goods.put("userType", tb.getUserType() == 1 ? 2 : 1);

      goods.put("price", tb.getReservePrice().toString());

      goods.put("zkPrice", tb.getZkPrice().toString());

      JSONObject goodsJson = new JSONObject();

      goodsJson.put("auctionId", tb.getAuctionId());

      goodsJson.put("imgList", finalImgList);

      goodsJson.put("title", tb.getTitle());

      goodsJson.put("userType", tb.getUserType() == 1 ? 2 : 1);

      goodsJson.put("price", tb.getReservePrice().toString());

      goodsJson.put("zkPrice", tb.getZkPrice().toString());



      // 30天销量

      goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));

      goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));



      // 分享赚

      BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);

@@ -1953,7 +1955,7 @@
      LogHelper.test(String.format("PID: uid-%s  pid-%s", uid + "", pid));



      // 是否有券

      goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);

      goodsJson.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);



      // 领券人列表

      List<ShamUser> listCouponUser = new ArrayList<ShamUser>();

@@ -1982,19 +1984,21 @@
         tb.setCouponLinkTaoToken(token);



         // 服务端转链

         if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {

            couponInfo.put("couponUrl", tb.getCouponLink());

         } else {

            couponInfo.put("couponUrl",

                  TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + ""));

         }

         // if (convertInServer &&

         // !StringUtil.isNullOrEmpty(tb.getCouponLink())) {

         couponInfo.put("couponUrl", tb.getCouponLink());

         // } else {

         // couponInfo.put("couponUrl",

         // TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid,

         // tb.getAuctionId() + ""));

         // }



         couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));

         couponInfo.put("couponTime", "使用期限：" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"

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

         // 券的口令

         couponInfo.put("couponToken", token);

         goods.put("couponInfo", couponInfo);

         goodsJson.put("couponInfo", couponInfo);



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

            // 领券人列表

@@ -2007,7 +2011,7 @@
         BigDecimal proportion = manageService.getFanLiRate();

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goods.put("hongBao", hongBao);

      goodsJson.put("hongBao", hongBao);



      data.put("tbPidInfo", clientTBPid);



@@ -2025,7 +2029,7 @@
         else

            jumpUrl = tb.getAuctionUrl();

      }

      goods.put("jumpUrl", jumpUrl);

      goodsJson.put("jumpUrl", jumpUrl);



      TaoBaoShopInfo tbShopInfo = redisManager.getTBShopInfo(tb.getShopTitle(), tb.getSellerId(), tb.getAuctionId());

      if (tbShopInfo != null) {

@@ -2037,7 +2041,7 @@
         }

      }

      // 店铺

      goods.put("shopInfo", tbShopInfo);

      goodsJson.put("shopInfo", tbShopInfo);



      // 分享路径

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

@@ -2051,7 +2055,7 @@
      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);



      data.put("goods", goods);

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

@@ -2175,20 +2179,48 @@


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



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

         // 获取详情

         TaoBaoGoodsBrief taoBaoGoodsBrief = null;

         try {

            taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goods.getAuctionId());

         } catch (Exception e) {

            e.printStackTrace();

         }

      TaoKeAppInfo app = new TaoKeAppInfo();

      app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);

      app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

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

      app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);



         if (taoBaoGoodsBrief != null) {

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

         }

      List<Long> ids = new ArrayList<>();

      for (TaoBaoGoodsBrief goods : goodsList)

         ids.add(goods.getAuctionId());



      });

      try {

         goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

      } catch (TaoKeApiException e1) {

         e1.printStackTrace();

      } catch (TaobaoGoodsDownException e1) {

         e1.printStackTrace();

      }



      if (goodsList != null)

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



            // 获取详情

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

            }



         });



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

      // 删除推荐