yujian
2019-08-15 01e773cf27e572b8fb83538d85f31130930d93d1
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -228,7 +228,7 @@
   @Override
   public void fanli() {
      // 获取主红包
      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 1000);
      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBaoV2.TYPE_ZIGOU, 1000);
      //
      // /**
      // * 需要实时更新待返利的订单
@@ -292,6 +292,11 @@
   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {
      // 查询最新的红包数据
      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
      // 正常用户才能到账
      UserInfo mainUser = userInfoMapper.selectByPrimaryKey(hb1.getUserInfo().getId());
      if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {
         return;
      }
      // 查询红包相关联的订单
      HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb1.getId());
      if (hongBaoOrder == null) {
@@ -576,6 +581,12 @@
                     || co.getSourceType() == Constant.SOURCE_TYPE_PDD) {
                  hongBaoList.remove(i);
                  i--;
               } else {// 上级用户不是正常用户,订单均不能到账
                  UserInfo userInfo = userInfoMapper.selectByPrimaryKey(item.getUserInfo().getId());
                  if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
                     hongBaoList.remove(i);
                     i--;
                  }
               }
            }
         }