邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

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

@@ -12,9 +12,12 @@
import org.springframework.context.event.ContextRefreshedEvent;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Component;

import org.yeshi.utils.tencentcloud.COSManager;

import org.yeshi.utils.tencentcloud.entity.COSInitParams;



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

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

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

import com.yeshi.fanli.entity.push.PushQueueRecord;

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

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

@@ -27,8 +30,6 @@
import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import org.yeshi.utils.tencentcloud.COSManager;

import org.yeshi.utils.tencentcloud.entity.COSInitParams;



/**

 * 系统初始化

@@ -85,7 +86,7 @@
      if (Constant.IS_TASK) {

         doExtractResult();// 处理提现结果

         doTaoBaoOrders();// 处理淘宝订单

         doOrderFanLi();// 处理订单返利

         doOrderFanLiNew();// 新版返利

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

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

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

@@ -166,7 +167,11 @@
                        orderProcessService.processOrder(map);

                     }

                  } catch (Exception e) {

                     try {

                        LogHelper.errorDetailInfo(e);

                     } catch (Exception e1) {



                     }

                  }

               }

            }

@@ -175,22 +180,22 @@
   }



   /**

    * 处理淘宝订单返利

    * 处理新版淘宝订单返利

    */

   public void doOrderFanLi() {

   public void doOrderFanLiNew() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {

                  Map<String, HongBao> map = CMQManager.getInstance().consumeFanLiMsg(16);

                  Map<String, HongBaoV2> map = CMQManager.getInstance().consumeFanLiMsgNew(16);

                  if (map != null) {

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

                     while (its.hasNext()) {

                        String handler = its.next();

                        try {

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

                           CMQManager.getInstance().deleteFanLiMsg(handler);

                           CMQManager.getInstance().deleteFanLiMsgNew(handler);

                        } catch (TaoBaoWeiQuanException e) {

                           try {

                              LogHelper.errorDetailInfo(e);