2.0.7相关服务端功能添加

admin

2020-02-23 b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458

 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java

@@ -167,13 +167,21 @@
      BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);



      BigDecimal maxCommission = CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate());

      if (params.getMaxRewardRate() != null)

         moneyInfoVO

               .setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

      else

         moneyInfoVO.setMaxMoney("¥" + CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate()));

         moneyInfoVO.setMaxMoney("¥" + maxCommission);



      moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));



      moneyInfoVO.setRateInfo("返利比 " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)),

            CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");

		
      moneyInfoVO.setMaxRateInfo("返利比 " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)),

            CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");



      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 券信息

@@ -408,7 +416,9 @@
      moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6



      BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());



      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate());

      moneyInfoVO.setFanliMoney("¥" + commission);

      if (params.getMaxRewardRate() != null)

         moneyInfoVO

@@ -423,8 +433,18 @@
         BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);

         moneyInfoVO.setMaxRateInfo("返利比 " + maxRate + "%");

         moneyInfoVO.setMaxMoney("¥" + maxCommission);

         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }



      moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));



      goodsInfo.setMoneyInfo(moneyInfoVO);



      // 券信息

@@ -586,6 +606,10 @@
      moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6

      BigDecimal commission = JDUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

      moneyInfoVO.setFanliMoney("¥" + commission);

      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = JDUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());



      if (params.getMaxRewardRate() != null)

         moneyInfoVO

               .setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

@@ -598,6 +622,15 @@
         BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);

         moneyInfoVO.setMaxRateInfo("返利比 " + maxRate + "%");

         moneyInfoVO.setMaxMoney("¥" + maxCommission);



         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }

      moneyInfoVO.setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate()));

      goodsInfo.setMoneyInfo(moneyInfoVO);

@@ -780,6 +813,10 @@
         goodsInfo.setCouponInfo(coupon);

      }



      BigDecimal baseCommisstion = null;

      if (params.getBaseFanliRate() != null)

         baseCommisstion = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());



      if (params.getMaxRewardRate() != null)

         moneyInfoVO

               .setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

@@ -793,6 +830,15 @@
         moneyInfoVO.setMaxRateInfo("返利比 " + maxRate + "%");



         moneyInfoVO.setMaxMoney("¥" + maxCommission);



         if (baseCommisstion != null) {

            String desc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  commission.subtract(baseCommisstion).setScale(2).toString());

            String maxDesc = String.format("佣金¥ %s+平台补贴¥ %s", baseCommisstion.setScale(2).toString(),

                  maxCommission.subtract(baseCommisstion).setScale(2).toString());

            moneyInfoVO.setCompositionInfo(desc);

            moneyInfoVO.setMaxCompositionInfo(maxDesc);

         }

      }

      goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -822,5 +868,4 @@
      return goodsInfo;

   }



	
}