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

@@ -12,9 +12,12 @@
import com.yeshi.fanli.dto.jd.JDOrderResult;

import com.yeshi.fanli.entity.jd.JDOrder;

import com.yeshi.fanli.exception.jd.JDOrderException;

import com.yeshi.fanli.service.inter.jd.JDOrderService;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

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;

@@ -36,18 +39,28 @@
    */

   public void saveJDOrders(List<JDOrder> jdOrderList) {

      for (JDOrder order : jdOrderList) {

         if (order.getValidCode() == 15)// 过滤掉代付款状态

         LogHelper.orderInfo("京东订单:" + order.getOrderId() + "-" + order.getValidCode());

         if (order.getValidCode() == 15)// 过滤掉待付款

            continue;



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

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

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

            continue;

         }



         try {

            jdOrderService.addJDOrder(order);

            /**

             * 做频率限制

             */

            String key = "jd-order-" + 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();

         }

@@ -61,6 +74,7 @@
   public void updateSoonOrder() {

      if (!Constant.IS_TASK)

         return;

      LogHelper.job("开始爬取京东订单");

      long now = System.currentTimeMillis();



      JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);

@@ -107,7 +121,7 @@
      if (result != null) {

         jdOrderList.addAll(result.getOrderList());

         while (result != null && result.isHasMore()) {

            result = JDApiUtil.getOrderList(page++, pageSize,date, JDApiUtil.ORDER_TYPE_UPDATETIME);

            result = JDApiUtil.getOrderList(page++, pageSize, date, JDApiUtil.ORDER_TYPE_UPDATETIME);

            if (result != null)

               jdOrderList.addAll(result.getOrderList());

         }

@@ -129,7 +143,7 @@
      for (int i = 0; i < 24; i++) {

         Date da = new Date(startTime.getTime() + 1000 * 60 * 60L * i);

         if (da.getTime() > now.getTime())

            return;

            break;

         List<JDOrder> tempOrderList = getHourOrder(da);

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

            orderList.addAll(tempOrderList);

@@ -137,7 +151,6 @@
      saveJDOrders(orderList);

   }



	
   /**

    * 更新最近3天的订单（每天早上凌晨0点过10分，早上8点过10分）

    */