Merge remote-tracking branch 'origin/master'

admin

2019-04-04 3a6e476b2f498e876ff10f1328455f58e63ee85a

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

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

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

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

         doUpdateGoodsJob();

      } else if (!Constant.IS_TEST) {

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

         // doUpdateGoodsJob();

         // 
      }

   }



@@ -255,7 +256,7 @@
                           }

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

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

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

@@ -411,10 +412,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,13 +426,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();

                                    // 下级昵称

                                    String workerNickName = threeSale.getWorker().getNickName();

												
                                    userSystemCouponService.activatedWelfareFreeCoupon(bossId, workerNickName);



                                    String workerNickName = userInfoService

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



                                    userSystemCouponService.activatedWelfareFreeCoupon(bossId,

                                          workerNickName);

                                 }

                              }

                              ThreeSaleCMQManager.getInstance()