Merge remote-tracking branch 'origin/master'

yujian

2019-05-30 ebce479a2d0634c90e5f80045e204248336b410d

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java

@@ -31,26 +31,22 @@


   @Override

   public void startSyncGoods() {

      LogHelper.test("大淘客同步开始");

      // 判断是否有正在进行的更新

      String key1 = "dataoke-updating";

      // if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key1)))

      // return;



      // 开始更新

      redisManager.cacheCommonString(key1, "1", 60 * 20);

      long firstTime = System.currentTimeMillis() - 1000 * 60 * 5L;

      int totalCount = 0;

      for (int p = 1; p <= 2000; p++) {// 10W数据

         DaTaoKeApiResult result = DaTaoKeApiUtil.goodsList(p);

         if (result.getDetailList().size() < 50)// 更新完成

         {

            redisManager.removeCommonString(key1);

            break;

         try {

            DaTaoKeApiResult result = DaTaoKeApiUtil.goodsList(p);

            if (result.getDetailList().size() < 50)// 更新完成

            {

               break;

            }

            addGoodsList(result.getDetailList());

            totalCount += result.getDetailList().size();

         } catch (Exception e) {

         }

         addGoodsList(result.getDetailList());

         totalCount += result.getDetailList().size();

      }



      LogHelper.test("大淘客总共更新数据数量:" + totalCount);

      // 清除过期数据

      if (totalCount > 50000)// 保证有5w数据再清除过期

@@ -107,8 +103,10 @@
      List<DaTaoKeDetail> daTaoKeList = daTaoKeDetailMapper.listByGoodsIds(goodsIdList);

      if (daTaoKeList == null || daTaoKeList.size() == 0)

         return goods;



      // 重新设置标题与券价格

      goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0));



      return goods;

   }



@@ -119,6 +117,7 @@


   @Override

   public List<DaTaoKeDetail> listByDtitle(String dtitle) {



      return daTaoKeDetailMapper.listByDtitle(dtitle.trim());

   }



@@ -133,4 +132,9 @@
      return daTaoKeDetailMapper.countSearchByTitleWithCid(title, (cid == null || cid == 0 ? null : cid));

   }



   @Override

   public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId, int count) {

      return daTaoKeDetailMapper.getGoodsNotInList(cid, listId, count);

   }



}