Merge remote-tracking branch 'origin/div' into div

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 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)));

   }