消息调整

yujian

2020-04-15 f301c983314494841e54aa0cd87d01a4bdc72d16

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

@@ -604,20 +604,20 @@
            payment = new BigDecimal(0);

         goodsVO.setActualPay("¥" + payment.setScale(2, BigDecimal.ROUND_DOWN));

         

         BigDecimal fanli = hongBaoOrder.getHongBaoV2().getMoney();

         // 基础佣金

         BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);

         if (type == 3) { // 奖金

            goodsVO.setBonus("¥" + hongBaoOrder.getHongBaoV2().getMoney() +"");

         } else { // 佣金

            goodsVO.setCommision("¥" +commission);

         }

			
         // 平台补贴

         BigDecimal vipFanli = hongBaoOrder.getHongBaoV2().getMoney();

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

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

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

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

         //  达人补贴

         if (userLevel != UserLevelEnum.daRen) {

            BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, UserLevelEnum.daRen);

            goodsVO.setOriginSubsidy("¥" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");

         }

			
         if (type == 3) { // 奖金

            goodsVO.setBonus("¥" + fanli.setScale(2, BigDecimal.ROUND_DOWN) +"");

         }

         

         voList.add(goodsVO);

@@ -655,7 +655,7 @@
               lowerSubsidy = MoneyBigDecimalUtil.div(teamSubsidy.multiply(daRenRate), originRate);

            }

            

            if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.superVIP) {

            if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.tearcher) {

               BigDecimal vipRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,   buyerUserLevel, 

                     UserLevelEnum.superVIP, direct);

               upperTotalMoney = upperTotalMoney.add(MoneyBigDecimalUtil.div(teamSubsidy.multiply(vipRate), originRate));

@@ -689,7 +689,6 @@
      

      // 上级返利

      if (upperLevel != null) {

         upperTotalMoney = upperTotalMoney.add(hongBao);

         orderRebateVO.setUpperFanLi("¥" + upperTotalMoney);

         orderRebateVO.setJumpLink(upperLevel.getDetailLink());

      }