Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -20,6 +20,7 @@


import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;

import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;

import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;

import com.yeshi.fanli.entity.ad.DouYinClickEvent;

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

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

@@ -35,7 +36,6 @@
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;

@@ -58,6 +58,7 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.manger.order.TeamDividentsManager;

import com.yeshi.fanli.util.ad.DouYinAdUtil;

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

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

@@ -139,6 +140,9 @@
   @Resource

   private DeviceActiveService deviceActiveService;



   @Resource

   private TeamDividentsManager teamDividentsManager;



   private static boolean isInited = false;



   public void onApplicationEvent(ContextRefreshedEvent arg0) {

@@ -164,7 +168,6 @@
         doTaoBaoNewOrders();// 处理淘宝订单（刚刚产生的）

         doOrderFanLiNew();// 新版返利

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

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

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

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

         doUserMoneyDebtJob();// 债务偿还

@@ -176,6 +179,9 @@
         doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加

         // doPlaceOrderIntegralJob();// 下单赠送金币任务

         // doDouYinDeviceActiveJob();// 抖音设备激活广告监测



         doDividentsJob();



      }

   }



@@ -381,47 +387,6 @@
                           orderProcessService.fanliInvaiteAndShare(map.get(handler));

                           CMQManager.getInstance().deleteFanLiTiChengMsg(handler);

                        } catch (TaoBaoWeiQuanException 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 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) {

@@ -1109,4 +1074,34 @@
      });

   }



   // 分红

   public void doDividentsJob() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               Map<String, UserDividentsDayDTO> map = CMQManager.getInstance().consumeTeamDividentsMsg(16);

               if (map != null) {

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

                  while (its.hasNext()) {

                     String key = its.next();

                     UserDividentsDayDTO dto = map.get(key);

                     try {

                        teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getDay());

                     } catch (Exception e) {

                        try {

                           LogHelper.errorDetailInfo(e);

                        } catch (Exception e1) {

                           e1.printStackTrace();

                        }

                     } finally {



                     }

                  }

               }

            }

         }

      });

   }



}