消息

yujian

2020-04-13 c93dfa3912f0fed74faa2f5f3ef42c318a04a7a2

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -744,8 +744,7 @@
      UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());

      if (userLevel == null)

         userLevel = UserLevelEnum.daRen;

		
      UserLevelEnum upperLevel = UserLevelUtil.getNextLevel(userLevel);

      UserLevelEnum upperLevel =  UserLevelEnum.superVIP;

            

      BigDecimal upperTotalMoney = new BigDecimal(0);

      List<GoodsRebateVO> voList = new ArrayList<>();

@@ -773,7 +772,7 @@
         

         BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);

         if (type == 3) { // 奖金

            goodsVO.setBonus(hongBaoOrder.getHongBaoV2().getMoney() +"");

            goodsVO.setBonus("¥" + hongBaoOrder.getHongBaoV2().getMoney() +"");

         } else { // 佣金

            goodsVO.setCommision("¥" +commission);

         }

@@ -788,10 +787,8 @@
         }

         

         voList.add(goodsVO);

         if (upperLevel != null) {

            upperTotalMoney = upperTotalMoney

                  .add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

         }

		
         upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

      }

         

      // 团队补贴

@@ -821,7 +818,7 @@
            orderRebateVO.setOriginSubsidy("¥" + lowerSubsidy.setScale(2));

         }

         orderRebateVO.setSubsidyDesc("团队补贴");

         orderRebateVO.setSubsidy(teamSubsidy.setScale(2) +"");

         orderRebateVO.setSubsidy("¥" + teamSubsidy.setScale(2) +"");

      }

      

      orderRebateVO.setType(type);