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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -397,4 +397,11 @@
      return getShowComputeRate(platform, version, UserLevelEnum.daRen);

   }



   @Override

   public BigDecimal getFanliRate(UserLevelEnum userLevel, Date date) {

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

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

      return rate;

   }



}