Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-25 011d53f9f3d08af8cd622585ce40eb880f313aaf

 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateTBRelationAndSpecialOrderJob.java

@@ -84,7 +84,8 @@
            while (its.hasNext()) {

               String key = its.next();

               List<TaoBaoOrder> orders = map.get(key);

               String redisKey = "addorderqueue-" + TaoBaoOrderUtil.getOrderDataHashCode(orders);;

               String redisKey = "addorderqueue-" + TaoBaoOrderUtil.getOrderDataHashCode(orders);

               ;

               // redis做频率限制

               try {

                  if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {

@@ -133,6 +134,7 @@
   public void doJob2() {

      if (!Constant.IS_TASK)

         return;

      LogHelper.orderInfo("爬单:5min爬取一次单");

      long endTime = System.currentTimeMillis();

      updateRelationAndSpecialOrder(endTime - 1000 * 60 * 60 * 24L, endTime);

      updateRelationAndSpecialSettleOrder(endTime - 1000 * 60 * 60 * 24L, endTime);