Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

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

@@ -93,7 +93,7 @@
      if (rate == null)

         return null;

      BigDecimal baseRate = hongBaoManageService.getBaseFanliRate(placeOrderTime.getTime());

      BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, userLevel, false);

      BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, buyerUserLevel, false);

      return MoneyBigDecimalUtil.div(fanLiMoney.multiply(baseRate).multiply(rate),

            baseRate.add(officialSubsidyRate).multiply(new BigDecimal(100)));

   }

@@ -105,7 +105,7 @@
      if (rate == null)

         return null;

      BigDecimal baseRate = hongBaoManageService.getBaseFanliRate(placeOrderTime.getTime());

      BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, userLevel, false);

      BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, buyerUserLevel, false);

      return MoneyBigDecimalUtil.div(fanLiMoney.multiply(baseRate).multiply(rate),

            baseRate.add(officialSubsidyRate).multiply(new BigDecimal(100)));

   }