淘宝分享佣金比例修改

admin

2020-05-31 2a48f2bd979d56ce4114ba9d56efaf49bab705d7

淘宝分享佣金比例修改

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

@@ -906,7 +906,7 @@
        goods.put("zkPrice", tb.getZkPrice().toString());



        BigDecimal proportion = manageService.getFanLiRate();

        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);

        goods.put("hongBao", hongBao);



        // 30天销量

@@ -1388,7 +1388,7 @@
                        TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods.getGoods(),

                                TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);

                        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),

                                TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                                TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);

                        TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();

                        vo.setLeft(goods.getLeftHongBaoCount());

                        vo.setMoney(hongBao);

@@ -2180,7 +2180,7 @@
            BigDecimal proportion = manageService.getFanLiRate();

            if ("taolijin".equalsIgnoreCase(from))

                proportion = manageService.getTLJShareRate(System.currentTimeMillis());

            hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

            hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);

        }

        goodsJson.put("hongBao", hongBao);



@@ -2350,7 +2350,7 @@


            fanliValid = true;

            goodsJson.put("shareValid", false);

            String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();

            String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70),false).toString();

            TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();

            vo.setLeft(buyGoods.getLeftHongBaoCount());

            vo.setMoney(tljHongBao);


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5TaoLiJinController.java

@@ -70,7 +70,7 @@
                continue;

            }

            // 计算推广红包

            BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion);

            BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion,false);

            // 推广红包 不能小于1

            if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0) {

                continue;


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

@@ -450,7 +450,7 @@
        if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

            goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

            goodsDetail.getMoneyInfo().setShareMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods,

                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));

                    hongBaoManageService.getShareRate(UserLevelEnum.superVIP),true));

            goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

            goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());

        }

@@ -552,7 +552,7 @@
            shareValid = false;

            helpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());



            BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

            BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);



            ReduceHongBao reduceHongBao = new ReduceHongBao();

            reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());


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

@@ -584,7 +584,7 @@
                        GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);



                        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),

                                TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                                TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);



                        ReduceHongBao reduceHongBao = new ReduceHongBao();

                        reduceHongBao.setLeft(goods.getLeftHongBaoCount());


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

@@ -684,7 +684,7 @@
            // 设置评论文本选项
            shareInfo.setCommentTextChoiceList(
                    getCommentChoiceList(shareInfo.getCommentText(), null, inviteCode, TaoBaoUtil.getGoodsHongBaoMoney(
                            taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));
                            taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP),false)));

            out.print(JsonUtil.loadTrueResult(
                    JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));

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

@@ -585,7 +585,7 @@
            }



            // 计算推广红包

            BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion);

            BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion,true);



            // 推广红包 不能小于1

            if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0) {

@@ -662,7 +662,7 @@
            }



            // 计算推广红包

            BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion);

            BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion,true);



            // 推广红包 不能小于1

            if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java

@@ -911,7 +911,7 @@
            throw new ShareGoodsException(4, "商品已下架");

        }



        BigDecimal perface = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70));

        BigDecimal perface = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70),false);

        TaoLiJinDTO taoLiJinDTO = null;

        try {

            taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "自购立减", perface, 1,


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java

@@ -43,7 +43,7 @@
    @Override

    public String getGoodsUserHongBao(TaoBaoGoodsBrief goods) {

        BigDecimal rate = hongBaoManageService.getFanLiRate();

        return TaoBaoUtil.getGoodsHongBaoInfo(goods, rate);

        return TaoBaoUtil.getGoodsHongBaoInfo(goods, rate,false);

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java

@@ -96,7 +96,7 @@
                for (int i = 0; i < list.size(); i++) {

                    // 过滤淘礼金大于10块钱的

                    BigDecimal hongBao = TaoBaoUtil.getGoodsHongBaoMoney(list.get(i).getGoods(),

                            TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                            TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);

                    if (hongBao.compareTo(new BigDecimal(10)) > 0) {

                        list.remove(i--);

                    }

@@ -204,7 +204,7 @@
            return;

        List<TLJBuyGoods> list = tljBuyGoodsDao.listByAuctionId(goods.getAuctionId());

        // 查询自购立减是否小于1元

        BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

        BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);

        // if (money.compareTo(new BigDecimal(1)) < 0) {// 删除商品

        // if (list != null)

        // for (TLJBuyGoods tljGoods : list) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsUpdateServiceImpl.java

@@ -29,7 +29,7 @@
            return;

        List<TLJBuyGoods> list = tljBuyGoodsDao.listByAuctionId(goods.getAuctionId());

        // 查询自购立减是否小于1元

        BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

        BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);

        // if (money.compareTo(new BigDecimal(1)) < 0) {// 删除商品

        // if (list != null)

        // for (TLJBuyGoods tljGoods : list) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java

@@ -76,7 +76,7 @@
            for (int i = 0; i < list.size(); i++) {

                // 过滤淘礼金大于10块钱的

                BigDecimal hongBao = TaoBaoUtil.getGoodsHongBaoMoney(list.get(i).getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);

                if (hongBao.compareTo(new BigDecimal(10)) > 0) {

                    list.remove(i--);

                }


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java

@@ -380,7 +380,7 @@
            TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

            listGoodsBrief.add(goodsBrief);



            BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, rate);

            BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, rate,true);

            totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);

        }




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

@@ -13,6 +13,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



public class CommonOrderFactory {



@@ -134,11 +135,15 @@
        CommonOrder commonOrder = new CommonOrder();

        commonOrder.setCount(taoBaoOrder.getCount());

        commonOrder.setCreateTime(new Date());



        // 如果relationId不为空



        if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null)

            commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy()));

        else

            commonOrder.seteIncome(taoBaoOrder.geteIncome());

        commonOrder.setEstimate(taoBaoOrder.getEstimate());



        commonOrder.setOrderNo(taoBaoOrder.getOrderId());

        commonOrder.setPayment(taoBaoOrder.getPayment());

        commonOrder.setSettlement(taoBaoOrder.getSettlement());

@@ -166,6 +171,13 @@
        commonOrder.setTradeId(taoBaoOrder.getTradeId());

        commonOrder.setChildSourceType(taoBaoOrder.getOrderType());



        if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {

            commonOrder.setEstimate(

                    TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.getEstimate()));

            commonOrder.seteIncome(

                    TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.geteIncome()));

        }



        return commonOrder;

    }




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

@@ -298,16 +298,16 @@
                moneyInfoVO.setMaxMoney("¥" + taoBaoHongBaoInfo.getHongbao()

                        .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));

            else

                moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

                moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));

        } else {

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

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

            moneyInfoVO.setFanliMoney("¥" + commission);

            if (params.getMaxRewardRate() != null)

                moneyInfoVO.setMaxMoney(

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

            else

                moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

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

                moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));

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

        }

        goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -431,10 +431,10 @@
        MoneyInfoVO moneyInfoVO = new MoneyInfoVO();

        moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6



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

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

        BigDecimal baseCommisstion = null;

        if (params.getBaseFanliRate() != null)

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

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

        moneyInfoVO.setFanliMoney("¥" + commission);

        if (params.getMaxRewardRate() != null)

            moneyInfoVO

@@ -445,7 +445,7 @@
            BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);

            moneyInfoVO.setRateInfo("返利比 " + rate + "%");



            BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate());

            BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false);

            BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);

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

            moneyInfoVO.setMaxMoney("¥" + maxCommission);

@@ -459,7 +459,7 @@
            }

        }



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

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



        goodsInfo.setMoneyInfo(moneyInfoVO);




 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -7,6 +7,7 @@
import java.net.URLEncoder;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

@@ -739,7 +740,7 @@


        hongBaoInfo.setRate("最高40%");



        String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion));

        String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion), false);

        if (hongbao.contains("最高")) {

            hongBaoInfo.setType(1);

            hongBaoInfo.setHongbao(new BigDecimal(0));

@@ -1031,7 +1032,7 @@


        hongBaoInfo.setRate("最高40%");



        String hongbao = getGoodsHongBaoInfo(tb, proportion);

        String hongbao = getGoodsHongBaoInfo(tb, proportion, false);

        if (!hongbao.contains("最高"))

            hongBaoInfo.setHongbao(new BigDecimal(hongbao.replace("¥", "")));

        else

@@ -1407,12 +1408,12 @@
     *            用户再次分成比例（0-100）

     * @return

     */

    public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

    public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate, boolean share) {

        // if (goodsBrief != null && goodsBrief.getMaterialLibType() != null &&

        // goodsBrief.getMaterialLibType() == 0)

        // return "¥0.00";

        // else

        return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();

        return "¥" + getGoodsHongBaoMoney(goodsBrief, rate, share).toString();

    }



    /**

@@ -1422,7 +1423,7 @@
     * @param rate

     * @return

     */

    public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

    public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate, boolean share) {

        BigDecimal money = null;

        if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())

                || goodsBrief.getCouponInfo().trim().equalsIgnoreCase("无")) {

@@ -1448,6 +1449,10 @@
                        new BigDecimal("0.01")), MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));

            }

        }



        if (share)

            money = TaoBaoUtil.getCanShareMoney(new Date(), money);



        return BigDecimalUtil.getWithNoZera(money);

    }



@@ -1482,7 +1487,7 @@
     */



    public static BigDecimal getShareGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

        return getGoodsHongBaoMoney(goodsBrief, rate);

        return getGoodsHongBaoMoney(goodsBrief, rate, true);

    }



    /**

@@ -2178,4 +2183,23 @@
        return urlList;

    }



    /**

     * 获取能够分的钱

     * @Title: getCanShareMoney

     * @Description: 
     * @param estimate

     * @return 
     * BigDecimal 返回类型

     * @throws

     */

    public static BigDecimal getCanShareMoney(Date createTime, BigDecimal estimate) {

        if (estimate == null)

            return null;

        if (createTime.getTime() < TimeUtil.convertToTimeTemp("2020-05-01", "yyyy-MM-dd")) {

            return estimate;

        }

        BigDecimal rate = new BigDecimal("0.8876");

        return MoneyBigDecimalUtil.mul(estimate, rate);

    }



}


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoLiJinUtil.java

@@ -24,7 +24,7 @@
     */

    public static BigDecimal getSpreadMoney(String warningRate, TaoBaoGoodsBrief goodsBrief) {

        LogHelper.error("推广红包-商品信息:"+new Gson().toJson(goodsBrief));

        BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(100));

        BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(100),true);

        LogHelper.error("推广红包-商品总佣金:"+spreadMoney);

        return MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.div(new BigDecimal(warningRate),new BigDecimal("100")), spreadMoney);

    }