系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

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

@@ -64,7 +64,7 @@
      String version = acceptData.getVersion();



      AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type, platform,

            Integer.parseInt(version));

            Integer.parseInt(version),acceptData.getSystem());

      if ("home".equalsIgnoreCase(type) && VersionUtil.smallerThan_1_5_1(platform, version) && ap != null) {

         AppPageNotification no = new AppPageNotification();

         no.setContentUrl("");

@@ -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<>();