分享订单到账消息调整

yujian

2020-04-16 a1cc60298bd8b9cbddb29ad7c5e8e59ea1ee790c

 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.mq.UidDateDTO;

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

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

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

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

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

         doOrderFanLiNew();// 新版返利

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

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

         doOrderShareFanLi();

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

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

         doUserMoneyDebtJob();// 债务偿还

@@ -369,29 +371,58 @@
   }



   /**

    * 处理淘宝提成订单返利

    * 处理团队订单返利

    */

   public void doOrderTiChengFanLi() {

   public void doOrderTeamIncomeFanLi() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {



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

                  Map<String, UidDateDTO> map = CMQManager.getInstance().consumeFanLiTeamIncomeMsg(16);

                  if (map != null) {

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

                     while (its.hasNext()) {

                        String handler = its.next();

                        try {

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

                           CMQManager.getInstance().deleteFanLiTiChengMsg(handler);

                        } catch (TaoBaoWeiQuanException e) {

                           UidDateDTO dto = map.get(handler);

                           orderProcessService.fanliPreInvaite(dto.getUid(), dto.getDate());

                           CMQManager.getInstance().deleteTeamIncomeMsg(handler);

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

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

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        }

                     }

                  }

               } catch (Exception e) {



               }

            }

         }

      });

   }



   /**

    * 处理分享订单返利

    */

   public void doOrderShareFanLi() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {

                  Map<String, UidDateDTO> map = CMQManager.getInstance().consumeFanLiShareMsg(16);

                  if (map != null) {

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

                     while (its.hasNext()) {

                        String handler = its.next();

                        try {

                           UidDateDTO dto = map.get(handler);

                           orderProcessService.fanliShare(dto.getUid(), dto.getDate());

                           CMQManager.getInstance().deleteFanLiShareMsg(handler);

                        } catch (Exception e) {

                           try {

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

@@ -1087,7 +1118,7 @@
                     String key = its.next();

                     UserDividentsDayDTO dto = map.get(key);

                     try {

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

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

                     } catch (Exception e) {

                        try {

                           LogHelper.errorDetailInfo(e);