冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

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

@@ -29,6 +29,7 @@
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

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

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

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

@@ -72,6 +73,9 @@
   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private TaoBaoOrderService taoBaoOrderService;



   private static boolean isInited = false;



   public void onApplicationEvent(ContextRefreshedEvent arg0) {

@@ -99,9 +103,10 @@
         doWeiQuanOrder();// 处理维权订单

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

         doThreeSaleUserCouponJob();// 处理邀请队列

         doUpdateGoodsJob();

      } else if (!Constant.IS_TEST) {

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

         // doUpdateGoodsJob();

         //

      }

   }



@@ -164,7 +169,7 @@
    */

   public void doTaoBaoOrders() {

      // 同时开启3个线程处理

      for (int i = 0; i < 3; i++) {

      for (int i = 0; i < 1; i++) {

         executor.execute(new Runnable() {

            @Override

            public void run() {

@@ -173,6 +178,13 @@
                     // 取16个订单

                     Map<String, List<TaoBaoOrder>> map = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);

                     if (map != null) {

                        // 从库里面查询

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

                        while (its.hasNext()) {

                           String orderId = its.next();

                           List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);

                           map.put(orderId, orderList);

                        }

                        orderProcessService.processOrder(map);

                     }

                  } catch (Exception e) {

@@ -255,7 +267,7 @@
                           }

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

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

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

@@ -411,10 +423,8 @@


               while (true) {

                  try {



                     Map<String, ThreeSale> map = ThreeSaleCMQManager.getInstance()

                           .consumeQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, 16);



                     if (map != null) {



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

@@ -427,9 +437,16 @@
                              if (threeSale != null) {

                                 if (threeSale.getState() != null && threeSale.getState() == true) {

                                    // 邀请成功 - 券激活生效

                                    LogHelper.test("doThreeSaleUserCouponJob-"+threeSale.getId());

                                    LogHelper.test("doThreeSaleUserCouponJob-" + threeSale.getId());



                                    Long bossId = threeSale.getBoss().getId();

                                    userSystemCouponService.activatedWelfareFreeCoupon(bossId);

                                    // 下级昵称



                                    String workerNickName = userInfoService

                                          .selectByPKey(threeSale.getWorker().getId()).getNickName();



                                    userSystemCouponService.activatedWelfareFreeCoupon(bossId,

                                          workerNickName);

                                 }

                              }

                              ThreeSaleCMQManager.getInstance()