Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java

@@ -16,7 +16,6 @@
import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.dividents.TeamDividentsDebt;

import com.yeshi.fanli.entity.order.dividents.TeamDividentsRecord;

@@ -24,6 +23,7 @@
import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceUser;

import com.yeshi.fanli.exception.ParamsException;

import com.yeshi.fanli.exception.money.TeamDividentsDebtException;

import com.yeshi.fanli.exception.money.TeamEincomeRecordException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.dividents.TeamDividentsRecordException;

import com.yeshi.fanli.exception.order.dividents.TeamDividentsSourceOrderException;

@@ -35,10 +35,10 @@
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;

import com.yeshi.fanli.service.manger.money.TeamEincomeManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.factory.order.dividents.TeamDividentsSourceOrderFactory;

import com.yeshi.fanli.util.user.UserLevelUtil;



@@ -73,6 +73,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private TeamEincomeManager teamEincomeManager;



   @Transactional(rollbackFor = Exception.class)

   public void addDividentsSourceOrder(List<CommonOrder> commonOrderList) throws TeamDividentsSourceOrderException {

@@ -253,11 +256,12 @@
    * @throws

    */

   @Transactional(rollbackFor = Exception.class)

   public void addDividents(Long uid, String day)

         throws TeamDividentsRecordException, TeamDividentsDebtException, UserMoneyDetailException, ParamsException {

   public void addToTeamEincome(Long uid, String day) throws TeamDividentsRecordException, TeamDividentsDebtException,

         UserMoneyDetailException, ParamsException, TeamEincomeRecordException {

      Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));

      BigDecimal money = teamDividentsSourceUserService.sumMoneyByUidAndDay(uid, day);

      // 查询需要扣除的资金

      List<TeamDividentsDebt> list = teamDividentsDebtService.listNeedRepayDebt(uid, 1, 1000);

      List<TeamDividentsDebt> list = teamDividentsDebtService.listNeedRepayDebt(uid, preSendTime, 1, 1000);

      for (TeamDividentsDebt debt : list) {

         if (money.subtract(debt.getLeftMoney()).compareTo(new BigDecimal(0)) >= 0) {// 还有钱还

            money = money.subtract(debt.getLeftMoney());

@@ -279,12 +283,9 @@


      // 有分红才显示资金明细

      if (money.compareTo(new BigDecimal(0)) > 0) {

         UserMoneyDetail detail = UserMoneyDetailFactory.createOrderTeamDividents(uid, money, new Date());

         // 增加资金

         userMoneyService.addUserMoney(uid, money, detail);

         // TODO 加入通知

      }



         teamEincomeManager.addTeamDividents(uid, preSendTime, money);

      }

   }



   /**