Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

 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;

@@ -35,6 +36,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.util.CMQManager;

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;

@@ -79,6 +81,9 @@


   @Resource

   private CommonOrderService commonOrderService;



   @Resource

   private OrderMoneySettleService orderMoneySettleService;



   /**

    * 新版获取普通订单

@@ -206,7 +211,7 @@
            Iterator<String> its = map.keySet().iterator();

            while (its.hasNext()) {

               String key = its.next();

               String redisKey = "addorderqueue-" + key;

               String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, key);

               // redis做频率限制

               try {

                  if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {

@@ -380,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 * * * ? ")

@@ -412,7 +429,8 @@
            List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderService.getTaoBaoOrderByOrderId(lo.getOrderId());

            // 清除频率限制

            if (taoBaoOrderList != null && taoBaoOrderList.size() > 0) {

               String key = "addorderqueue-" + lo.getOrderId();

               String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, lo.getOrderId());



               redisManager.removeCommonString(key);

               addOrder(taoBaoOrderList);

               LogHelper.test("自动处理淘宝订单:" + lo.getOrderId());