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

admin

2020-04-28 3937985da1ce712df86d546ced42f7a21feada94

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

@@ -18,6 +18,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.user.UserLevelUtil;



@@ -174,14 +175,16 @@
         key = String.format("official_subsidy_zigou_%s", userLevel.getLevel());

      BigDecimal rate = null;

      if (date != null)

         rate = hongBaoManageService.getByKeyAndMaxTime(key, date.getTime());

         rate = hongBaoManageService.getByKeyAndMaxTimeCache(key, TimeUtil

               .convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyy-MM-dd HH"), "yyyy-MM-dd HH"));

      else

         rate = new BigDecimal(hongBaoManageService.get(key));

      return rate;

   }



   private BigDecimal getRateByLevel(UserLevelEnum level, Date date) {

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

      BigDecimal baseRate = hongBaoManageService.getBaseFanliRateCache(

            TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyy-MM-dd HH"), "yyyy-MM-dd HH"));



      BigDecimal subsidyRate = getOfficialSubsidyRate(date, level, false);



@@ -379,8 +382,13 @@
   }



   private BigDecimal getFanliRate(Date time, UserLevelEnum userLevel) {

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

      BigDecimal rate = hongBaoManageService

            .getBaseFanliRateCache(TimeUtil

                  .convertToTimeTemp(TimeUtil.getGernalTime(time.getTime(), "yyyy-MM-dd HH"), "yyyy-MM-dd HH"))

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



      if (userLevel == UserLevelEnum.normalVIP)

         rate = new BigDecimal("61");

      return rate;

   }