Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

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

@@ -28,6 +28,7 @@
import com.yeshi.fanli.service.inter.common.DataMonitorService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

@@ -80,6 +81,9 @@


   @Resource

   private CommonOrderService commonOrderService;



   @Resource

   private OrderMoneySettleService orderMoneySettleService;



   /**

    * 新版获取普通订单

@@ -381,6 +385,18 @@
      return ReturnT.SUCCESS;

   }



   // 团队奖励到账

   @XxlJob("fanliOrderTeamRewardHandler")

   public ReturnT<String> fanliOrderTeamRewardHandler(String param) throws Exception {

      if (StringUtil.isNullOrEmpty(param))

         orderProcessService.fanliOrderTeamReward();

      else {

         orderProcessService.fanliOrderTeamReward(Long.parseLong(param));

      }



      return ReturnT.SUCCESS;

   }



   // 维权订单处理-处理最近60天的

   // 30分钟一次

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