admin
2019-11-03 788deca1b4a24f8a24e49c24f7d89975a1d74bbe
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -173,7 +173,7 @@
         doJDOrderJob();// 京东订单处理
         doPDDOrderJob();// 拼多多订单处理
         doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新
         // doHongBaoRecieveIntegralGetJob();// 返利到账,金币增加
         doHongBaoRecieveIntegralGetJob();// 返利到账,金币增加
         // doPlaceOrderIntegralJob();// 下单赠送金币任务
         // doDouYinDeviceActiveJob();// 抖音设备激活广告监测
      }
@@ -722,7 +722,6 @@
               }
            }
         });
   }
   /**
@@ -744,6 +743,12 @@
                        HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
                        if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
                              && hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
                           // 到账送金币
                           fanliGetIntegral(hongBaoV2);
                           HongBaoRecieveCMQManager.getInstance()
                                 .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
                           //返利不足0.01元送金币
                           if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 自购
                              // 判断是否为该用户的首笔红包
                              List<Integer> typeList = new ArrayList<>();
@@ -792,8 +797,9 @@
                                    if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
                                          "yyyyMMdd")) {
                                       if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 一级返利小于0.01
//                                          integralTaskRecordService.firstRebateOrderRewardBoss(threeSale.getBoss().getId(),
//                                                hongBaoV2.getUserInfo().getId(), null);
                                          integralTaskRecordService.firstRebateOrderRewardBoss(
                                                threeSale.getBoss().getId(),
                                                hongBaoV2.getUserInfo().getId(), null);
                                          LogHelper.test("自购-一级用户-" + threeSale.getBoss().getId()
                                                + "-hongBaoId:" + hongBaoV2.getId());
                                       }
@@ -809,8 +815,9 @@
                                       if (threeSale.getSucceedTime() > TimeUtil
                                             .convertToTimeTemp("20190901", "yyyyMMdd")) {
                                          if (secondLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 二级返利小于0.01
//                                             integralTaskRecordService.firstRebateOrderRewardBossSuper(threeSale.getBoss().getId(),
//                                                   hongBaoV2.getUserInfo().getId(), null);
                                             integralTaskRecordService.firstRebateOrderRewardBossSuper(
                                                   threeSale.getBoss().getId(),
                                                   hongBaoV2.getUserInfo().getId(), null);
                                             LogHelper.test("自购-二级用户-" + threeSale.getBoss().getId()
                                                   + "-hongBaoId:" + hongBaoV2.getId());
                                          }
@@ -864,8 +871,9 @@
                                    if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
                                          "yyyyMMdd")) {
                                       if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 一级返利小于0.01
//                                          integralTaskRecordService.firstSharerOrderRewardBoss(threeSale.getBoss().getId(),
//                                                hongBaoV2.getUserInfo().getId(), null);
                                          integralTaskRecordService.firstSharerOrderRewardBoss(
                                                threeSale.getBoss().getId(),
                                                hongBaoV2.getUserInfo().getId(), null);
                                          LogHelper.test("分享-一级用户-" + threeSale.getBoss().getId()
                                                + "-hongBaoId:" + hongBaoV2.getId());
                                       }
@@ -874,9 +882,7 @@
                              }
                           }
                        }
                        // HongBaoRecieveCMQManager.getInstance()
                        // .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL,
                        // key);
                     } catch (Exception e) {
                        try {
                           LogHelper.errorDetailInfo(e);
@@ -893,6 +899,21 @@
      });
   }
   private void fanliGetIntegral(HongBaoV2 hongBaoV2) {
      if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
            && hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
         if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 自购订单
            integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId());
         } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 分享订单
            integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId());
         } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 一级邀请
            integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId());
         } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 二级邀请
            integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId());
         }
      }
   }
   private boolean isFirstValidOrder(String orderId, int sourceType, Long uid) {
      CommonOrder commonOrder = commonOrderService.selectLatestValidByUid(uid);
      if (commonOrder != null && commonOrder.getOrderNo().equalsIgnoreCase(orderId)