订单爬取方式更改

admin

2019-03-09 7c20392173f080d22c4a6f8cb391b618f60aac29

订单爬取方式更改

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

@@ -16,6 +16,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

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

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

import com.yeshi.fanli.exception.TaoBaoOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.DataMonitorService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

@@ -200,34 +201,34 @@


    public void updateOrder(long startTime, long endTime) {

//        老版本处理方式

//        List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

//        List<TaoBaoOrder> orderList = new ArrayList<>();

//        try {

//            orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime, configList.get(0));

//        } catch (TaoBaoOrderException e2) {

//            try {

//                LogHelper.errorDetailInfo(e2);

//            } catch (Exception e) {

//                e.printStackTrace();

//            }

//        }

//        List<TaoBaoOrder> thirdOrderList = new ArrayList<>();

//        try {

//            thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime, endTime, configList.get(0));

//        } catch (TaoBaoOrderException e2) {

//            try {

//                LogHelper.errorDetailInfo(e2);

//            } catch (Exception e) {

//                e.printStackTrace();

//            }

//        }

//        if (thirdOrderList != null && thirdOrderList.size() > 0)

//            orderList.addAll(thirdOrderList);

		
        List<TaoBaoOrder> orderList=    getCommonOrder(startTime, endTime);

        List<TaoBaoOrder> tempOrderList2=getThirdCommonOrder(startTime, endTime);

        if(tempOrderList2!=null&&tempOrderList2.size()>0)

            orderList.addAll(tempOrderList2);

        List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

        List<TaoBaoOrder> orderList = new ArrayList<>();

        try {

            orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime, configList.get(0));

        } catch (TaoBaoOrderException e2) {

            try {

                LogHelper.errorDetailInfo(e2);

            } catch (Exception e) {

                e.printStackTrace();

            }

        }

        List<TaoBaoOrder> thirdOrderList = new ArrayList<>();

        try {

            thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime, endTime, configList.get(0));

        } catch (TaoBaoOrderException e2) {

            try {

                LogHelper.errorDetailInfo(e2);

            } catch (Exception e) {

                e.printStackTrace();

            }

        }

        if (thirdOrderList != null && thirdOrderList.size() > 0)

            orderList.addAll(thirdOrderList);

//新版本处理方式		
//        List<TaoBaoOrder> orderList=    getCommonOrder(startTime, endTime);

//        List<TaoBaoOrder> tempOrderList2=getThirdCommonOrder(startTime, endTime);

//        if(tempOrderList2!=null&&tempOrderList2.size()>0)

//            orderList.addAll(tempOrderList2);

        



        LogHelper.orderInfo("正在执行订单爬取结束，共有订单:" + orderList.size());