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

admin

2020-04-28 6f6c93d0cee6898fc1d3fa9d639b8273121b821d

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

@@ -381,6 +381,9 @@
   private BigDecimal getFanliRate(Date time, UserLevelEnum userLevel) {

      BigDecimal rate = hongBaoManageService.getBaseFanliRate(time.getTime())

            .add(getOfficialSubsidyRate(time, getCommonUserLevel(time, userLevel), false));



      if (userLevel == UserLevelEnum.normalVIP)

         rate = new BigDecimal("61");

      return rate;

   }