队员相关

yujian

2020-05-06 eb1adc13eda955e8ef0fc9fe41fb246fa89b722d

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

@@ -25,7 +25,6 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

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

@@ -43,7 +42,6 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

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

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

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

import com.yeshi.fanli.service.manger.user.UserLevelManager;

import com.yeshi.fanli.util.Constant;

@@ -97,9 +95,6 @@
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private TeamUserLevelStatisticService teamUserLevelStatisticService;



   /**

    * 添加红包信息

    * 

@@ -151,7 +146,6 @@
            }

         }



		
         int state = getOrderState(stateSet);



         /**

@@ -191,20 +185,20 @@
               case HongBaoV2.TYPE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                        commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());



                  break;



               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                        commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());

                  break;

               case HongBaoV2.TYPE_SHARE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                        commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());



                  break;

@@ -248,13 +242,32 @@
         List<Long> uidList = new ArrayList<Long>();

         for (ThreeSale ts : threeSales)

            uidList.add(ts.getBoss().getId());

         List<TeamUserLevelStatistic> levelList = teamUserLevelStatisticService.listByUids(uidList);

         if (levelList != null)

            for (TeamUserLevelStatistic s : levelList) {

               resultList.add(new UserTeamLevel(s.getId(), s.getLevel()));

            }



         for (Long bossUid : uidList) {

            UserLevelEnum level = userLevelManager.getUserLevel(bossUid);

            resultList.add(new UserTeamLevel(bossUid, level));

         }



      }



      return resultList;

   }



   private List<UserTeamLevel> getBossList(List<HongBaoV2> children) {

      List<UserTeamLevel> resultList = new ArrayList<>();

      for (HongBaoV2 v2 : children) {



         UserLevelEnum level = UserLevelUtil.getByOrderRank(v2.getUrank());

         if (level == null)

            level = UserLevelEnum.daRen;

         UserTeamLevel teamLevel = new UserTeamLevel(v2.getUserInfo().getId(), level);



         if (v2.getType() == HongBaoV2.TYPE_YIJI || v2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {

            resultList.add(0, teamLevel);

         } else {

            resultList.add(teamLevel);

         }

      }

      return resultList;

   }



@@ -334,7 +347,7 @@
         // 获取子红包

         List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());

         if (children != null && children.size() > 0) {

            List<UserTeamLevel> bossList = getBossList(hongBao.getUserInfo().getId(), 2);

            List<UserTeamLevel> bossList = getBossList(children);



            for (HongBaoV2 child : children) {

               if (child.getState() == HongBaoV2.STATE_YILINGQU)

@@ -381,7 +394,7 @@
                  }



                  if (boss != null) {

                     List<UserTeamLevel> bossList = getBossList(hongBao.getUserInfo().getId(), 2);

                     List<UserTeamLevel> bossList = getBossList(oldHongBao.getUserInfo().getId(), 2);



                     // 插入一级子红包

                     money = orderHongBaoMoneyComputeService.computeFirstInviteMoney(commonOrder, buyerLevel,

@@ -440,7 +453,7 @@
         // 获取子红包

         List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());

         if (children != null && children.size() > 0) {

            List<UserTeamLevel> bossList = getBossList(hongBao.getUserInfo().getId(), 2);

            List<UserTeamLevel> bossList = getBossList(children);

            for (HongBaoV2 child : children) {

               if (child.getState() == HongBaoV2.STATE_YILINGQU)

                  continue;