Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -35,6 +35,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

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

import com.yeshi.fanli.exception.money.OrderMoneySettleException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;

@@ -162,7 +163,8 @@
         doTaoBaoOrders();// 处理淘宝订单

         doTaoBaoNewOrders();// 处理淘宝订单（刚刚产生的）

         doOrderFanLiNew();// 新版返利

//         doOrderTiChengFanLi();// 处理订单提成返利

         doOrderTiChengFanLi();// 处理订单提成返利

         doOrderTeamRewardFanLi();// 团队奖励到账

         doWeiQuanOrder();// 处理维权订单

         doPushIOS();// 处理发送IOS消息

         doUserMoneyDebtJob();// 债务偿还

@@ -327,7 +329,8 @@
                        try {

                           HongBaoV2 hongbao = map.get(handler);

                           if (hongbao != null) {

                              String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.hongBaoFanLi, hongbao.getId() + "");

                              String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.hongBaoFanLi,

                                    hongbao.getId() + "");

                              if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

                                 // 处理之后要隔2小时再次进行处理

                                 redisManager.cacheCommonString(key, "1", 60 * 60 * 2);

@@ -401,6 +404,47 @@
   }



   /**

    * 订单团队奖励到账

    */

   public void doOrderTeamRewardFanLi() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {



                  Map<String, Long> map = CMQManager.getInstance().consumeOrderTeamRewardMsg(16);

                  if (map != null) {

                     Iterator<String> its = map.keySet().iterator();

                     while (its.hasNext()) {

                        String handler = its.next();

                        try {

                           orderProcessService.fanliOrderTeamReward(map.get(handler));

                           CMQManager.getInstance().deleteOrderTeamRewardMsg(handler);

                        } catch (OrderMoneySettleException e) {

                           try {

                              LogHelper.errorDetailInfo(e);

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        }

                     }

                  }

               } catch (Exception e) {



               }

            }

         }

      });

   }



   /**

    * 处理淘宝订单维权

    */

   public void doWeiQuanOrder() {