淘礼金自购商品修改

admin

2019-07-11 1e1b320929f7cabc0e655f76638653562031ff88

淘礼金自购商品修改

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

@@ -598,11 +598,6 @@
            // 计算推广红包

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



            // 推广红包 不能小于1

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

                continue;

            }



            TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),

                    null);

            // 去掉标签


 fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java

@@ -1,5 +1,8 @@
package com.yeshi.fanli.job;



import java.math.BigDecimal;

import java.util.Collections;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -9,14 +12,19 @@


import com.yeshi.fanli.entity.taobao.ShareHotGoods;

import com.yeshi.fanli.entity.taobao.TLJBuyGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

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

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



@Component

public class TaoLiJinJob {

@@ -29,6 +37,9 @@


    @Resource

    private TLJBuyGoodsService tljBuyGoodsService;



    @Resource

    private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



    /**

     * 更新报告

@@ -101,13 +112,46 @@
        for (int i = 0; i < list.size(); i++) {

            if (count >= 10)

                break;

            boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),

                    new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

                            TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));

            boolean success = tljBuyGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId());

            if (success) {

                count++;

            }

        }

    }



    /**

     * 每天晚上11点50添加淘礼金

     */

    @Scheduled(cron = "0 50 23 * * ? ")

    public void autoAddTLJBuyGoods() {

        if (!Constant.IS_TASK)

            return;

        String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");

        List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);

        Collections.shuffle(list);

        if (list.size() > 20)

            list = list.subList(0, 20);

        for (TaoBaoGoodsBrief goods : list) {

            // 获取商品详情

            try {

                goods = TaoKeApiUtil.searchGoodsDetail(goods.getAuctionId());

            } catch (TaobaoGoodsDownException e) {

                e.printStackTrace();

            }

            if (goods != null && goods.getCouponAmount() != null

                    && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {



                if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())

                        .compareTo(new BigDecimal("143")) >= 0) {

                    goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);

                    int totalHongBaoCount = 2000 + (int) (Math.random() * 8000);

                    int leftHongBaoCount = 200 + (int) (Math.random() * 2000);

                    tljBuyGoodsService.addTLJBuyGoods(

                            new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount),

                            TaoBaoConstant.ownBuyApp);

                }

            }

        }

    }



}


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

@@ -70,8 +70,19 @@
        List<TLJBuyGoods> list = tljBuyGoodsDao.listByDayOrderByUpdateTime(day, 1, count);

        List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

        if (list != null) {

            for (TLJBuyGoods shg : list)

            for (TLJBuyGoods shg : list) {

                // 计算推广红包

                BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(shg.getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                BigDecimal finalPrice = TaoBaoUtil.getAfterUseCouplePrice(shg.getGoods());



                // 推广红包 不能小于1,价格不能大于30

                if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0 || finalPrice.compareTo(new BigDecimal(30)) >= 0) {

                    continue;

                }



                goodsList.add(shg.getGoods());

            }

        }

        // 过滤下线商品

        goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java

@@ -230,8 +230,16 @@
            for (DaTaoKeDetailV2 v2 : result.getGoodsList()) {

                BigDecimal commision = MoneyBigDecimalUtil

                        .div(MoneyBigDecimalUtil.mul(v2.getActualPrice(), v2.getCommissionRate()), new BigDecimal(100));

                if (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0)

                    goodsList.add(v2);

                if (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0

                        && v2.getActualPrice().compareTo(new BigDecimal(30)) < 0 && v2.getMonthSales() >= 5000) {

                    Date time = new Date(TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"));

                    Date targetTime = new Date(TimeUtil

                            .convertToTimeTemp(TimeUtil.getGernalTime(

                                    System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2L, "yyyy-MM-dd"), "yyyy-MM-dd")

                            - 1000L);

                    if (time.getTime() >= targetTime.getTime())

                        goodsList.add(v2);

                }

            }

            return goodsList;

        } else