2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -18,6 +18,7 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;



import com.yeshi.fanli.dto.order.UserTeamLevel;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

@@ -39,6 +40,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.ESOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

   private UserVIPInfoService userVIPInfoService;



   @Resource

   private HongBaoV2Service hongBaoV2Service;

	
   @Resource

   private HongBaoOrderService hongBaoOrderService;



@@ -454,24 +459,9 @@
      data.put("selfMoney", selfMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

      data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

      

		
      BigDecimal teamMoney = new BigDecimal(0);

      if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);

      } else {

         BigDecimal bonus = null;

         BigDecimal dividend = null;  // TODO 分红统计

         if (dateType == 4) { // 已到账

            dividend = new BigDecimal(0);

            bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 2);

         } else { // 未失效

            bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 4);

         }

			
         dividend = new BigDecimal(0);

         // 总团队奖励

         teamMoney = bonus.add(dividend);

      }

      teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);



      data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

      out.print(JsonUtil.loadTrueResult(data));

   }

@@ -565,15 +555,20 @@
         }

      }

      

		
      // 红包获得者

      HongBaoV2 hongBaoV2 = hoList.get(0).getHongBaoV2();

      UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());

      if (userLevel == null)

         userLevel = UserLevelEnum.daRen;

      UserLevelEnum upperLevel =  UserLevelEnum.superVIP;

         

      // 订单购买者

      CommonOrder commonOrder1 = hoList.get(0).getCommonOrder();

      Date downTime = commonOrder1.getThirdCreateTime();

      UserLevelEnum buyer = UserLevelUtil.getByOrderRank(commonOrder1.getUrank());

      if (buyer == null) {

         buyer = UserLevelEnum.daRen;

      }

      

      BigDecimal upperTotalMoney = new BigDecimal(0);

      List<GoodsRebateVO> voList = new ArrayList<>();

@@ -592,7 +587,10 @@
         

         // 实付款

         BigDecimal payment = hongBaoOrder.getCommonOrder().getPayment();

         if (hongBaoOrder.getCommonOrder().getSettlement() != null)

         // 若已结算 -显示结算金额

         Integer orderState = hongBaoOrder.getCommonOrder().getState();

         if (hongBaoOrder.getCommonOrder().getSettlement() != null 
               && (orderState == CommonOrder.STATE_JS || orderState == CommonOrder.STATE_WQ))

            payment = hongBaoOrder.getCommonOrder().getSettlement();

         if (payment == null)

            payment = new BigDecimal(0);

@@ -602,6 +600,7 @@
         // 基础佣金

         BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);

         goodsVO.setCommision("¥" +commission.setScale(2, BigDecimal.ROUND_DOWN));

		
         // 平台补贴  = 返利 - 基础佣金

         goodsVO.setSubsidy("¥" + fanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));

         //  达人补贴

@@ -621,13 +620,28 @@
         } else if (type == 2) {

            upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));

         } else if (type == 3) {

            upperTotalMoney = upperTotalMoney.add(hongBao);

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

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

               bossLevelList.add(new UserTeamLevel(null, UserLevelEnum.superVIP));

               upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFirstInviteMoney(commonOrder,

                     buyer, bossLevelList));

            } else {

               Integer bRank = hongBaoV2Service.getDirectBossUrankByPid(hongBaoOrder.getHongBaoV2().getParent().getId());

               UserLevelEnum directBoss = UserLevelUtil.getByOrderRank(bRank);

               if (directBoss == null) {

                  directBoss = UserLevelEnum.daRen;

               }

               bossLevelList.add(new UserTeamLevel(null, directBoss));

               bossLevelList.add(new UserTeamLevel(null, UserLevelEnum.superVIP));

               upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeSecondInviteMoney(commonOrder,

                     buyer, bossLevelList));

            }

         }

      }

      

		
      orderRebateVO.setFanLiDesc(predictDesc + typeName);

      orderRebateVO.setFanLi("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN));

		
      orderRebateVO.setType(type);

      orderRebateVO.setStateDesc(stateDesc);

      orderRebateVO.setListGoods(voList);