admin
2019-09-11 e6670f2a6513c0f1d6e4f2d867d1010970014849
Merge branch 'master-2.0-pre-rename' into div
2个文件已修改
16 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoLiJinUtil.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -540,8 +540,8 @@
            OtherInfo otherInfo = new OtherInfo();
            RewardCouponVO rewardCoupon = new RewardCouponVO();
            rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
            rewardCoupon.setMaxMoney("¥" + MoneyBigDecimalUtil.mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate),
                    Constant.MAX_REWARD_RATE));
            rewardCoupon.setMaxMoney("¥" +TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate).add( MoneyBigDecimalUtil.mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate),
                    Constant.MAX_REWARD_RATE)));
            rewardCoupon.setDesc("用返利奖励券最高返");
            otherInfo.setRewardCoupon(rewardCoupon);
            goodsDetail.setOtherInfo(otherInfo);
@@ -630,7 +630,7 @@
        RewardCouponVO rewardCoupon = new RewardCouponVO();
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
        rewardCoupon.setMaxMoney(
                "¥" + MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE));
                "¥" +JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate).add( MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE)));
        rewardCoupon.setDesc("用返利奖励券最高返");
        otherInfo.setRewardCoupon(rewardCoupon);
        goodsDetail.setOtherInfo(otherInfo);
@@ -774,8 +774,8 @@
        OtherInfo otherInfo = new OtherInfo();
        RewardCouponVO rewardCoupon = new RewardCouponVO();
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
        rewardCoupon.setMaxMoney("¥" + MoneyBigDecimalUtil.mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate),
                Constant.MAX_REWARD_RATE));
        rewardCoupon.setMaxMoney("¥" +PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate).add(MoneyBigDecimalUtil.mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate),
                Constant.MAX_REWARD_RATE)));
        rewardCoupon.setDesc("用返利奖励券最高返");
        otherInfo.setRewardCoupon(rewardCoupon);
        goodsDetail.setOtherInfo(otherInfo);
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoLiJinUtil.java
@@ -2,7 +2,9 @@
import java.math.BigDecimal;
import com.google.gson.Gson;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
/**
@@ -21,8 +23,10 @@
     * @return
     */
    public static BigDecimal getSpreadMoney(String warningRate, TaoBaoGoodsBrief goodsBrief) {
        LogHelper.error("推广红包-商品信息:"+new Gson().toJson(goodsBrief));
        BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(100));
        return MoneyBigDecimalUtil.mul(new BigDecimal(warningRate).multiply(new BigDecimal("0.01")), spreadMoney);
        LogHelper.error("推广红包-商品总佣金:"+spreadMoney);
        return MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.div(new BigDecimal(warningRate),new BigDecimal("100")), spreadMoney);
    }
}