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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -19,6 +19,16 @@
   @Resource

   private HongBaoManageService hongBaoManageService;



   @Override

   public BigDecimal computeBaseFanliMoney(CommonOrder order) {

      return getBaseCommission(order);

   }



   @Override

   public BigDecimal computeBaseShareMoney(CommonOrder order) {

      return getBaseCommission(order);

   }



   // 获取基础佣金

   private BigDecimal getBaseCommission(CommonOrder order) {

      BigDecimal rate = hongBaoManageService.getBaseFanliRate(order.getThirdCreateTime().getTime());

@@ -90,7 +100,7 @@
   public BigDecimal computeFirstTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,

         UserLevelEnum userLevel) {

      BigDecimal rate = getTeamSubsidyRate(placeOrderTime, buyerUserLevel, userLevel, true);

      if (rate == null)

      if (rate == null || rate.compareTo(new BigDecimal(0)) == 0)

         return null;

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

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

@@ -102,7 +112,7 @@
   public BigDecimal computeSecondTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,

         UserLevelEnum userLevel) {

      BigDecimal rate = getTeamSubsidyRate(placeOrderTime, buyerUserLevel, userLevel, false);

      if (rate == null)

      if (rate == null || rate.compareTo(new BigDecimal(0)) == 0)

         return null;

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

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

@@ -160,10 +170,11 @@
    * BigDecimal 返回类型

    * @throws

    */

   private BigDecimal getTeamSubsidyRate(Date date, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel,

         boolean first) {

   @Override

   public BigDecimal getTeamSubsidyRate(Date date, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel,

         boolean direct) {

      String key = null;

      if (first)

      if (direct)

         key = String.format("team_subsidy_6_pre_%s_%s", buyerUserLevel.getLevel(), userLevel.getLevel());

      else

         key = String.format("team_subsidy_7_pre_%s_%s", buyerUserLevel.getLevel(), userLevel.getLevel());