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

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

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

@@ -14,12 +14,11 @@
import com.yeshi.fanli.exception.jd.JDOrderException;

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

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

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

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



//从淘宝爬去订单更新

@Component

//@Component

public class UpdateJDOrderJob {



   @Resource

@@ -34,7 +33,9 @@
    * @param jdOrderList

    */

   public void saveJDOrders(List<JDOrder> jdOrderList) {

      for (JDOrder order : jdOrderList)

      for (JDOrder order : jdOrderList) {

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

            continue;

         try {

            jdOrderService.addJDOrder(order);

            /**

@@ -42,13 +43,13 @@
             */

            String key = "jd-order-" + order.getOrderId();

            String result = redisManager.getCommonString(key);

            if (!StringUtil.isNullOrEmpty(result))

               continue;



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

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

         } catch (JDOrderException e) {

            e.printStackTrace();

         }

      }

   }



   /**

@@ -56,7 +57,15 @@
    */

   @Scheduled(cron = "0 0/1 * * * ? ")

   public void updateSoonOrder() {

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

      // if (!Constant.IS_TASK)

      // return;

      long now = System.currentTimeMillis();



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

      if (result != null && result.getOrderList() != null)

         saveJDOrders(result.getOrderList());

      // 查询上个小时的

      result = JDApiUtil.getOrderList(1, 200, new Date(now - 1000 * 60 * 60 * 24L), JDApiUtil.ORDER_TYPE_CREATETIME);

      if (result != null && result.getOrderList() != null)

         saveJDOrders(result.getOrderList());

   }

@@ -66,14 +75,19 @@
    */

   @Scheduled(cron = "0 0/10 * * * ? ")

   public void updateUpdateOrder() {

      // if (!Constant.IS_TASK)

      // return;

      List<JDOrder> jdOrderList = new ArrayList<>();

      int pageSize = 200;

      int page = 1;

      JDOrderResult result = JDApiUtil.getOrderList(page++, pageSize, new Date(), JDApiUtil.ORDER_TYPE_UPDATETIME);

      jdOrderList.addAll(result.getOrderList());

      while (result.isHasMore()) {

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

      if (result != null) {

         jdOrderList.addAll(result.getOrderList());

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

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

            if (result != null)

               jdOrderList.addAll(result.getOrderList());

         }

      }

      saveJDOrders(jdOrderList);

   }