等级显示问题

yujian

2020-04-26 ee1d39f11b9483b64a88029f1755a6e7166fea15

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java

@@ -73,6 +73,10 @@
      BigDecimal rate = hongBaoManageService.getBaseFanliRate(order.getThirdCreateTime().getTime())

            .add(getOfficialSubsidyRate(order.getThirdCreateTime(),

                  getCommonUserLevel(order.getThirdCreateTime(), userLevel), false));

      if (userLevel == UserLevelEnum.normalVIP) {

         rate = new BigDecimal("61");

      }



      if (order.getState() == CommonOrder.STATE_JS || order.getState() == CommonOrder.STATE_WQ)

         return MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(rate, order.geteIncome()), new BigDecimal(100));

      else if (order.getEstimate() != null)

@@ -86,6 +90,11 @@
      BigDecimal rate = hongBaoManageService.getBaseFanliRate(order.getThirdCreateTime().getTime())

            .add(getOfficialSubsidyRate(order.getThirdCreateTime(),

                  getCommonUserLevel(order.getThirdCreateTime(), userLevel), true));



      if (userLevel == UserLevelEnum.normalVIP) {

         rate = new BigDecimal("61");

      }



      if (order.getState() == CommonOrder.STATE_JS || order.getState() == CommonOrder.STATE_WQ)

         return MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(rate, order.geteIncome()), new BigDecimal(100));

      else if (order.getEstimate() != null)

@@ -222,6 +231,12 @@
            else {

               rate = null;

            }

         } else if (buyerLevel == UserLevelEnum.daRen && firstBoss.getLevel() == UserLevelEnum.normalVIP) {

            if (boss.getLevel() == UserLevelEnum.normalVIP)

               rate = hongBaoManageService.getByKeyAndMaxTime("new_invite_daren_7", date.getTime());

            else {

               rate = null;

            }

         }

         // 极差计算法

         if (rate == null) {