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

@@ -100,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);

@@ -112,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);