yujian
2020-01-18 f4a0f2acc63d7785eab108419a4e16f5f688cb95
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -162,7 +162,7 @@
         doTaoBaoOrders();// 处理淘宝订单
         doTaoBaoNewOrders();// 处理淘宝订单(刚刚产生的)
         doOrderFanLiNew();// 新版返利
         doOrderTiChengFanLi();// 处理订单提成返利
//         doOrderTiChengFanLi();// 处理订单提成返利
         doWeiQuanOrder();// 处理维权订单
         doPushIOS();// 处理发送IOS消息
         doUserMoneyDebtJob();// 债务偿还
@@ -327,7 +327,7 @@
                        try {
                           HongBaoV2 hongbao = map.get(handler);
                           if (hongbao != null) {
                              String key = "hongbao-fanli-" + hongbao.getId();
                              String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.hongBaoFanLi, hongbao.getId() + "");
                              if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
                                 // 处理之后要隔2小时再次进行处理
                                 redisManager.cacheCommonString(key, "1", 60 * 60 * 2);
@@ -840,14 +840,28 @@
   private void fanliGetIntegral(HongBaoV2 hongBaoV2) {
      if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
            && hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
         // 查询对应的订单号
         Long mainHongBaoId = hongBaoV2.getId();
         if (hongBaoV2.getParent() != null && hongBaoV2.getParent().getId() != null)
            mainHongBaoId = hongBaoV2.getParent().getId();
         HongBaoOrder hongbaoOrder = hongBaoOrderService.selectDetailByHongBaoId(mainHongBaoId);
         if (hongbaoOrder == null || hongbaoOrder.getCommonOrder() == null)
            return;
         CommonOrder commonOrder = hongbaoOrder.getCommonOrder();
         if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 自购订单
            integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId());
            integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
                  commonOrder.getSourceType());
         } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 分享订单
            integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId());
            integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
                  commonOrder.getSourceType());
         } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 一级邀请
            integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId());
            integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
                  commonOrder.getSourceType());
         } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 二级邀请
            integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId());
            integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
                  commonOrder.getSourceType());
         }
      }
   }