Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java

@@ -16,12 +16,11 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import com.yeshi.fanli.dto.taobao.WeiQuanOrderResult;

import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.DataMonitorService;

@@ -373,8 +372,7 @@
   public void doJob2() {

      if (!Constant.IS_TASK)

         return;

      doTaoBaoWeiQuan();



      doTaoBaoWeiQuan(10);

      orderProcessService.fanli();

   }



@@ -392,14 +390,40 @@
   public void doTaoBaoWeiQuan() {

      if (!Constant.IS_TASK)

         return;

      List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

      List<TaoBaoWeiQuanOrder> orderList = TaoBaoOrderUtil.getWeiQuanOrders(

            System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 60L, System.currentTimeMillis(), configList.get(0));

      if (orderList != null)

      // 新版维权订单处理

      doTaoBaoWeiQuan(60);

   }



   private void doTaoBaoWeiQuan(int day) {

      for (int i = 0; i < day; i++) {

         List<TaoBaoWeiQuanOrder> orderList = new ArrayList<>();

         WeiQuanOrderResult result = TaoKeOrderApiUtil

               .getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(

                     TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),

                     "yyyy-MM-dd")), 1, false);

         orderList.addAll(result.orderList);



         result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(

               TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),

               "yyyy-MM-dd")), 1, true);

         orderList.addAll(result.orderList);



         result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(

               TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),

               "yyyy-MM-dd")), 1, false);

         orderList.addAll(result.orderList);



         result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(

               TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),

               "yyyy-MM-dd")), 1, true);

         orderList.addAll(result.orderList);



         for (TaoBaoWeiQuanOrder order : orderList)

            taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 添加维权订单到数据库

      // 处理维权订单

      orderProcessService.weiQuanOrder(orderList);

         // 处理维权订单

         orderProcessService.weiQuanOrder(orderList);

      }



   }



   // 每6个小时执行一次