Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

 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;



/**

 * 系统初始化

@@ -91,7 +92,7 @@
         doPushIOS();// 处理发送IOS消息

      } else if (!Constant.IS_TEST) {

         initScheduler();// 启动定时任务

//         doUpdateGoodsJob();

         // doUpdateGoodsJob();

      }

   }



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

                     }

                  } catch (Exception e) {

                     try {

                        LogHelper.errorDetailInfo(e);

                     } catch (Exception e1) {



                     }

                  }

               }

            }

@@ -191,6 +196,47 @@
                        try {

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

                           CMQManager.getInstance().deleteFanLiMsg(handler);

                        } catch (TaoBaoWeiQuanException e) {

                           try {

                              LogHelper.errorDetailInfo(e);

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        }

                     }

                  }



               } catch (Exception e) {



               }

            }

         }

      });

   }



   /**

    * 处理新版淘宝订单返利

    */

   public void doOrderFanLiNew() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {

                  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().deleteFanLiMsgNew(handler);

                        } catch (TaoBaoWeiQuanException e) {

                           try {

                              LogHelper.errorDetailInfo(e);

@@ -376,7 +422,7 @@
                        }

                     }

                  } catch (Exception e) {

                     LogHelper.error("更新商品出错:"+e.getMessage());

                     LogHelper.error("更新商品出错:" + e.getMessage());



                  }

               }