yujian
2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
@@ -106,22 +106,25 @@
            totalList.addAll(list);
      }
      Map<Long, BigDecimal> moneyMap = new HashMap<>();
      Map<String, BigDecimal> moneyMap = new HashMap<>();
      for (TeamDividentsSourceOrderUserMap order : totalList) {
         TeamDividentsSourceOrderUserMap map = teamDividentsSourceOrderUserMapService
               .selectByPrimaryKeyForUpdate(order.getId());
         if (map != null && map.getState() == TeamDividentsSourceOrderUserMap.STATE_JS) {
            String key = map.getTargetUid() + "#" + map.getType();
            // 计算分红对应的资金
            if (moneyMap.get(map.getTargetUid()) == null)
               moneyMap.put(map.getTargetUid(), new BigDecimal(0));
            moneyMap.put(map.getTargetUid(), moneyMap.get(map.getTargetUid()).add(map.getMoney()));
            if (moneyMap.get(key) == null)
               moneyMap.put(key, new BigDecimal(0));
            moneyMap.put(key, moneyMap.get(key).add(map.getMoney()));
            teamDividentsSourceOrderUserMapService.send(map.getId());
         }
      }
      for (Iterator<Long> its = moneyMap.keySet().iterator(); its.hasNext();) {
         Long uid = its.next();
      for (Iterator<String> its = moneyMap.keySet().iterator(); its.hasNext();) {
         String key = its.next();
         Long uid = Long.parseLong(key.split("#")[0]);
         Integer type = Integer.parseInt(key.split("#")[1]);
         BigDecimal dividents = moneyMap.get(uid).setScale(2, BigDecimal.ROUND_DOWN);
         // 将资金分配到参与分红的用户
         TeamDividentsSourceUser teamDividentsSourceUser = new TeamDividentsSourceUser();
@@ -129,6 +132,7 @@
         teamDividentsSourceUser.setMoney(dividents);
         teamDividentsSourceUser.setSourceUid(sourceUid);
         teamDividentsSourceUser.setTargetUid(uid);
         teamDividentsSourceUser.setType(type);
         teamDividentsSourceUserService.addTeamDividentsSourceUser(teamDividentsSourceUser);
      }
   }
@@ -147,22 +151,10 @@
      return count == 0;
   }
   /**
    * @throws TeamDividentsDebtException
    * 添加分红记录
    * @Title: addDividentsRecord
    * @Description:
    * @param uid -用户ID
    * @param money -分红金额
    * @param day -分红日期
    * void 返回类型
    * @throws
    */
   @Transactional(rollbackFor = Exception.class)
   public void addToTeamEincome(Long uid, Date preSendTime) throws TeamDividentsRecordException,
   private void addToTeamEincome(Long uid, Date preSendTime, int type) throws TeamDividentsRecordException,
         TeamDividentsDebtException, UserMoneyDetailException, ParamsException, TeamEincomeRecordException {
      String day = TimeUtil.getGernalTime(preSendTime.getTime(), "yyyy-MM-dd");
      BigDecimal money = teamDividentsSourceUserService.sumMoneyByUidAndDay(uid, day);
      BigDecimal money = teamDividentsSourceUserService.sumMoneyByUidAndDay(uid, day, type);
      // 查询需要扣除的资金
      List<TeamDividentsDebt> list = teamDividentsDebtService.listNeedRepayDebt(uid, preSendTime, 1, 1000);
      for (TeamDividentsDebt debt : list) {
@@ -182,12 +174,33 @@
      record.setMoney(money);
      record.setState(TeamDividentsRecord.STATE_VALID);
      record.setUid(uid);
      record.setType(type);
      teamDividentsRecordService.addTeamDividentsRecord(record);
      // 有分红才显示资金明细
      if (money.compareTo(new BigDecimal(0)) > 0) {
         teamEincomeManager.addTeamDividents(uid, preSendTime, money);
         teamEincomeManager.addTeamDividents(uid, preSendTime, money, type);
      }
   }
   /**
    * @throws TeamDividentsDebtException
    * 添加分红记录
    * @Title: addDividentsRecord
    * @Description:
    * @param uid -用户ID
    * @param money -分红金额
    * @param day -分红日期
    * void 返回类型
    * @throws
    */
   @Transactional(rollbackFor = Exception.class)
   public void addToTeamEincome(Long uid, Date preSendTime) throws TeamDividentsRecordException,
         TeamDividentsDebtException, UserMoneyDetailException, ParamsException, TeamEincomeRecordException {
      addToTeamEincome(uid, preSendTime, TeamDividentsSourceOrderUserMap.TYPE_MORE_THAN_2);
      addToTeamEincome(uid, preSendTime, TeamDividentsSourceOrderUserMap.TYPE_TEAM_DIVIDENTS);
   }
   /**