Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMoneyComputeService.java

@@ -70,7 +70,8 @@
    * BigDecimal 返回类型

    * @throws

    */

   public BigDecimal computeFirstTeamSubsidy(BigDecimal fanLiMoney,Date placeOrderTime, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel);

   public BigDecimal computeFirstTeamSubsidy(BigDecimal fanLiMoney, Date placeOrderTime, UserLevelEnum buyerUserLevel,

         UserLevelEnum userLevel);



   /**

    * 计算间接粉丝团队补贴

@@ -98,9 +99,7 @@
    * BigDecimal 返回类型

    * @throws

    */

   public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy,Date placeOrderTime, BigDecimal secondTeamSubsidy,

         UserLevelEnum userLevel);



   public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy, Date placeOrderTime, UserLevelEnum userLevel);

   

   /**

    * 计算二级团队奖励

@@ -112,6 +111,7 @@
    * BigDecimal 返回类型

    * @throws

    */

   public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy,Date placeOrderTime, UserLevelEnum userLevel);

   public BigDecimal computeSecondTeamReward(BigDecimal secondTeamSubsidy, Date placeOrderTime,

         UserLevelEnum userLevel);



}