dubbo集成修改

admin

2020-07-16 be67478cae6bf9308f15949a21e7d0a57a3f0ecb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java

@@ -27,7 +27,7 @@
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.manger.AppUpdateManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import org.yeshi.utils.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;



@@ -126,7 +126,7 @@


      Collections.reverse(levelList);



      BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());

      BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date(),acceptData.getSystem());



      moneyBigDecial = MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);



@@ -146,7 +146,7 @@


      // 计算二级外分红

      List<UserTeamRate> moreThan2LevelList = orderHongBaoMoneyComputeService

            .getTeamRewardMoreThan2LevelRates(levelList.get(0), bossList, date);

            .getTeamRewardMoreThan2LevelRates(levelList.get(0), bossList, date,acceptData.getSystem());

      if (moreThan2LevelList != null)

         for (UserTeamRate rate : moreThan2LevelList) {

            teamReward2Map.put(rate.getUid(), rate);

@@ -154,25 +154,25 @@


      // 计算一级奖金

      if (bossList.size() >= 1) {

         UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);

         UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1,acceptData.getSystem());

         if (rate != null)

            teamRewardMap.put(rate.getUid(), rate);

      }

      // 计算二级奖金

      if (bossList.size() >= 2) {

         UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 2);

         UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 2,acceptData.getSystem());

         if (rate != null)

            teamRewardMap.put(rate.getUid(), rate);

      }



      // 计算分红

      rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(levelList.get(0), bossList, date);

      rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(levelList.get(0), bossList, date,acceptData.getSystem());

      if (rateList != null)

         for (UserTeamRate rate : rateList) {

            teamDividentsMap.put(rate.getUid(), rate);

         }



      BigDecimal fanliRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), date);

      BigDecimal fanliRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), date,acceptData.getSystem());



      List<String> resultList = new ArrayList<>();