Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java

@@ -17,6 +17,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.JDOrderCMQManager;

import com.yeshi.fanli.util.jd.JDApiUtil;

@@ -42,9 +43,9 @@
         if (order.getValidCode() == 15)// 过滤掉待付款

            continue;



         //防止多个商品拆单问题，爬取

         // 防止多个商品拆单问题，爬取

         if (order.getOrderItemList().size() > 1

               && order.getOrderTime() > System.currentTimeMillis() - 1000 * 60 * 2L) {

               && order.getOrderTime() > System.currentTimeMillis() - 1000 * 60 * 3L) {

            continue;

         }



@@ -53,12 +54,13 @@
            /**

             * 做频率限制

             */

            String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.JDOrder,  order.getOrderId() + "" );

            String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.JDOrder, order.getOrderId() + "");

            String result = redisManager.getCommonString(key);

            // 判断



            JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");

            redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2小时内不再更新

            if (StringUtil.isNullOrEmpty(result)) {

               JDOrderCMQManager.getInstance().addJDOrder(order.getOrderId() + "");

               redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2小时内不再更新

            }

         } catch (JDOrderException e) {

            e.printStackTrace();

         }