淘宝订单修改

admin

2019-03-08 0487f5c83c180037c7cc537585359efad3047437

淘宝订单修改

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java

@@ -19,6 +19,9 @@

    // 通过订单号获取订单列表
    List<TaoBaoOrder> selectTaoBaoOrderByOrderId(String orderId);
	
    // 通过交易ID获取订单
    TaoBaoOrder selectTaoBaoOrderByTradeId(String tradeId);

    int updateByPrimaryKeySelective(TaoBaoOrder record);


 fanli/src/main/java/com/yeshi/fanli/dto/order/OrderQuery.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.dto.order;



public class OrderQuery {

    public OrderQuery() {

    }



    public String startTime;// 开始查询时间 如:2019-01-01 00:00:00

    public    Integer span;// 查询时间范围（s）:最大1200

    public    Integer pageNo;// 页码

    public    Integer pageSize;// 每页数量，最大100

    public    Integer tkStatus;// 订单状态 1: 全部订单，3：订单结算，12：订单付款， 13：订单失效，14：订单成功；

                        // 订单查询类型为‘结算时间’时，只能查订单结算状态

    public String orderQueryType;// 订单查询类型，创建时间“create_time”，或结算时间“settle_time”

    public Integer orderScene;// 订单场景类型，1:常规订单，2:渠道订单，3:会员运营订单，默认为1，通过设置订单场景类型，媒体可以查询指定场景下的订单信息，例如不设置，或者设置为1，表示查询常规订单，常规订单包含淘宝客所有的订单数据，含渠道，及会员运营订单，但不包含3方分成，及维权订单

    public Integer orderCountType;// 订单数据统计类型，1: 2方订单，2: 3方订单，如果不设置，或者设置为1，表示2方订单

}


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

New file
@@ -0,0 +1,232 @@
package com.yeshi.fanli.job;



import java.util.ArrayList;

import java.util.Date;

import java.util.Iterator;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import com.yeshi.fanli.entity.bus.user.Order;

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

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;

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

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.PidOrderService;

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

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

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

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



//从淘宝爬去订单更新

@Component

public class UpdateCommonOrderJob {



    public UpdateCommonOrderJob() {

        System.out.println("初始化:UpdateOrderJob");

    }



    @Resource

    private OrderItemServcie orderItemServcie;



    @Resource

    private ThreeSaleGiftService threeSaleGiftService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private PidOrderService pidOrderService;



    @Resource

    private OrderProcessService orderProcessService;



    @Resource

    private TaoBaoOrderUtil taoBaoOrderUtil;



    @Resource

    private TaoBaoOrderService taoBaoOrderService;



    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;



    @Resource

    private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;



    @Resource

    private DataMonitorService dataMonitorService;



    @Resource

    private RedisManager redisManager;



    @Resource

    private LostOrderService lostOrderService;



    @Resource

    private OrderService orderService;



    /**

     * 新版获取普通订单

     * 
     * @param startTime

     * @param span

     * @return

     */

    private List<TaoBaoOrder> getCommonOrder(long startTime, int span) {

        int page = 1;

        String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");

        List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,

                Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

        while (orderList.size() == 100 * page) {

            page++;

            List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }



    /**

     * 按天获取普通订单（新版）

     * 
     * @param date

     * @return

     */

    private List<TaoBaoOrder> getCommonOrderByDay(Date date) {

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

        // 将一天分成12段

        for (int i = 0; i < 72; i++) {

            List<TaoBaoOrder> tempOrderList = getCommonOrder(date.getTime() + 1000 * 60 * 20L * i, 1200);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }



    /**

     * 将订单添加到数据库（新版）

     * 
     * @param orderList

     */

    private void addOrderNew(List<TaoBaoOrder> orderList) {

        try {

            taoBaoOrderService.addTaoBaoOrderList(orderList);

        } catch (Exception e) {

            try {

                LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

                e1.printStackTrace();

            }

        }



        if (orderList != null)

            for (int i = 0; i < orderList.size(); i++) {

                // 移除会员运营ID（不包含补单的情况）与渠道专属订单

                if (orderList.get(i).getAdPositionName().contains("会员运营")

                        || orderList.get(i).getAdPositionName().contains("渠道专属")) {

                    if (orderList.get(i).getAdPositionName().contains("会员运营")) {// 处理订单申诉

                        Order order = orderService.findOrderByOrderIdAndType(orderList.get(i).getOrderId(),

                                Order.ORDER_TYPE_TAOBAO);

                        if (order != null && order.getBeizhu().contains("补单")) {// 不排除补单的情况



                        } else {

                            orderList.remove(i);

                            i--;

                            break;

                        }

                    } else {

                        orderList.remove(i);

                        i--;

                    }

                }

            }



        try {

            Map<String, List<TaoBaoOrder>> map = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList);

            if (map != null) {

                Iterator<String> its = map.keySet().iterator();

                while (its.hasNext()) {

                    String key = its.next();

                    List<TaoBaoOrder> orders = map.get(key);

                    String redisKey = "addorderqueue-" + key;

                    // redis做频率限制

                    try {

                        if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {

                            continue;

                        }



                    } catch (Exception e) {



                    }



                    CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);



                    try {

                        // 6小时内不再处理

                        redisManager.cacheCommonString(redisKey, "1", 60 * 60 * 6);

                    } catch (Exception e) {



                    }

                }

            }

        } catch (Exception e) {

            try {

                LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

                e1.printStackTrace();

            }

        }

    }



    // 每5分钟爬取一次近6小时的

    @Scheduled(cron = "0 0/5 * * * ? ")

    public void doJob1() {

        if (!Constant.IS_TASK)

            return;

        long currentTime = System.currentTimeMillis();

        String h = TimeUtil.getGernalTime(currentTime, "HH");

        String m = TimeUtil.getGernalTime(currentTime, "mm");

        int mm = Integer.parseInt(h) * 60 + Integer.parseInt(m);

        int pos = mm / 15;

        if (pos >= 90)

            pos = 89;

        long startTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(currentTime, "yyyy-MM-dd"), "yyyy-MM-dd")

                - (1000 * 60 * 60 * 24L * (90 - pos));

        long endTime = startTime + 1000 * 60 * 60 * 24L;

        LogHelper.orderInfo("正在执行订单爬取...");

//        updateOrder(startTime, endTime);

    }



    // 淘宝推广订单 每隔30秒执行一次

    @Scheduled(cron = "0/30 * * * * ? ")

    public void doJob2() {

        if (!Constant.IS_TASK)

            return;

        long startTime = System.currentTimeMillis();

        // 30s爬取一次近5分钟的

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

        addOrderNew(orderList);

    }



}


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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.job;



import java.util.ArrayList;

import java.util.Date;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

@@ -10,7 +11,7 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.taobao.api.TaobaoObject;

import com.yeshi.fanli.entity.bus.user.Order;

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

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

@@ -36,6 +37,7 @@
import com.yeshi.fanli.util.TimeUtil;

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

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

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



//从淘宝爬去订单更新

@Component

@@ -84,7 +86,122 @@
    @Resource

    private OrderService orderService;



    private void updateOrder(long startTime, long endTime) {

    /**

     * 新版获取普通订单

     * 
     * @param startTime

     * @param span

     * @return

     */

    private static List<TaoBaoOrder> getCommonOrder(long startTime, int span) {

        int page = 1;

        String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");

        List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,

                Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

        while (orderList.size() == 100 * page) {

            page++;

            List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }

	
    /**

     * 获取第三方普通订单

     * @param startTime

     * @param span

     * @return

     */

    private static List<TaoBaoOrder> getThirdCommonOrder(long startTime, int span) {

        int page = 1;

        String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");

        List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,

                Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

        while (orderList.size() == 100 * page) {

            page++;

            List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }



    /**

     * 获取某个区间段的订单

     * @param startTime

     * @param endTime

     * @return

     */

    public static List<TaoBaoOrder> getCommonOrder(long startTime, long endTime) {

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

        long span =(endTime - startTime)%1000==0? (endTime - startTime)/1000:(endTime - startTime)/1000+1;

        int count = (int) (span / 1200);

        if (span % 1200 != 0)

            count++;

        for (int i = 0; i < count; i++) {

            long startT = startTime + i * 1200 * 1000L;

            int s = 1200;

            if (endTime < startT + 1200 * 1000L) {

                s = (int) ((endTime - startT) / 1000) + 1;

                if (s < 60)

                    s = 60;

            }

            List<TaoBaoOrder> tempOrderList = getCommonOrder(startT, s);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }

	
	
    /**

     * 爬取三方订单

     * @param startTime

     * @param endTime

     * @return

     */

    public static List<TaoBaoOrder> getThirdCommonOrder(long startTime, long endTime) {

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

        long span =(endTime - startTime)%1000==0? (endTime - startTime)/1000:(endTime - startTime)/1000+1;

        int count = (int) (span / 1200);

        if (span % 1200 != 0)

            count++;

        for (int i = 0; i < count; i++) {

            long startT = startTime + i * 1200 * 1000L;

            int s = 1200;

            if (endTime < startT + 1200 * 1000L) {

                s = (int) ((endTime - startT) / 1000) + 1;

                if (s < 60)

                    s = 60;

            }

            List<TaoBaoOrder> tempOrderList = getThirdCommonOrder(startT, s);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }



    /**

     * 按天获取普通订单（新版）

     * 
     * @param date

     * @return

     */

    public List<TaoBaoOrder> getCommonOrderByDay(Date date) {

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

        // 将一天分成12段

        for (int i = 0; i < 72; i++) {

            List<TaoBaoOrder> tempOrderList = getCommonOrder(date.getTime() + 1000 * 60 * 20L * i, 1200);

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

                orderList.addAll(tempOrderList);

        }

        return orderList;

    }



    public void updateOrder(long startTime, long endTime) {

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

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

        try {

@@ -116,7 +233,42 @@
        } catch (InterruptedException e) {

            e.printStackTrace();

        }

    }



    public static List<TaoBaoOrder> mixTaoBaoOrder(List<TaoBaoOrder> commonOrderList, List<TaoBaoOrder> sorderList) {

        Map<String, List<TaoBaoOrder>> commonMap = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(commonOrderList);

        Map<String, List<TaoBaoOrder>> sMap = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(sorderList);

        // 获取订单交集

        Iterator<String> its = commonMap.keySet().iterator();

        List<String> commonOrderIdList = new ArrayList<>();

        List<String> sOrderIdList = new ArrayList<>();

        while (its.hasNext()) {

            String orderId = its.next();

            commonOrderIdList.add(orderId);

        }

        its = sMap.keySet().iterator();

        while (its.hasNext()) {

            String orderId = its.next();

            sOrderIdList.add(orderId);

        }



        // 求交集

        commonOrderIdList.retainAll(sOrderIdList);



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



        for (String orderId : commonOrderIdList) {

            List<TaoBaoOrder> list = commonMap.get(orderId);

            String specialId = sMap.get(orderId).get(0).getSpecialId();

            String relationId = sMap.get(orderId).get(0).getRelationId();

            for (TaoBaoOrder to : list) {

                to.setSpecialId(specialId);

                to.setRelationId(relationId);

                orderList.add(to);

            }

        }



        return orderList;

    }



    private void addRelationAndSpecialOrder(List<TaoBaoOrder> orderList) {


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

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



import java.util.Calendar;

import java.util.Collections;

import java.util.Comparator;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

@@ -20,6 +22,7 @@
import com.yeshi.fanli.util.TimeUtil;

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

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

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



/**

 * 淘宝渠道订单更新

@@ -36,6 +39,9 @@
    @Resource

    private RedisManager redisManager;



    @Resource

    private UpdateOrderJob updateOrderJob;



    /**

     * 更新渠道订单(最多20分钟)

     * 

@@ -43,7 +49,7 @@
     */

    private void updateRelationOrder(long startTime) {

        String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");

        List<TaoBaoOrder> orderList = TaoKeApiUtil.getTaoBaoRelationOrder(startTimeStr, 1, Constant.TAOBAO_AUTH_APPKEY,

        List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoRelationOrder(startTimeStr, 1, Constant.TAOBAO_AUTH_APPKEY,

                Constant.TAOBAO_AUTH_APPSECRET);

        addRelationAndSpecialOrder(orderList);

    }

@@ -60,14 +66,46 @@
        // 最近90天的订单

        String startTimeStr = TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 90L,

                "yyyy-MM-dd HH:mm:ss");

        for (int p = fromPage; p < toPage; p++) {

            List<TaoBaoOrder> orderList = TaoKeApiUtil.getTaoBaoRelationOrder(startTimeStr, p,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

            addRelationAndSpecialOrder(orderList);



            orderList = TaoKeApiUtil.getTaoBaoRelationThirdOrder(startTimeStr, p, Constant.TAOBAO_AUTH_APPKEY,

        Comparator<TaoBaoOrder> cm = new Comparator<TaoBaoOrder>() {

            @Override

            public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {

                long span = TimeUtil.convertToTimeTemp(o2.getCreateTime(), "yyyy-MM-dd HH:mm:ss")

                        - TimeUtil.convertToTimeTemp(o1.getCreateTime(), "yyyy-MM-dd HH:mm:ss");

                if (span > 0)

                    return 1;

                else if (span == 0)

                    return 0;

                else

                    return -1;

            }

        };



        for (int p = fromPage; p < toPage; p++) {

            // 爬取2方订单

            List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoRelationOrder(startTimeStr, p,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

            Collections.sort(orderList, cm);

            List<TaoBaoOrder> commonOrderList = UpdateOrderJob.getCommonOrder(

                    TimeUtil.convertToTimeTemp(orderList.get(orderList.size() - 1).getCreateTime(),

                            "yyyy-MM-dd HH:mm:ss"),

                    TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));



            List<TaoBaoOrder> list = UpdateOrderJob.mixTaoBaoOrder(commonOrderList, orderList);

            Collections.sort(list, cm);

            addRelationAndSpecialOrder(list);



            orderList = TaoKeOrderApiUtil.getTaoBaoRelationThirdOrder(startTimeStr, p, Constant.TAOBAO_AUTH_APPKEY,

                    Constant.TAOBAO_AUTH_APPSECRET);

            addRelationAndSpecialOrder(orderList);

            Collections.sort(orderList, cm);

            // 爬取三方订单

            commonOrderList = UpdateOrderJob.getThirdCommonOrder(

                    TimeUtil.convertToTimeTemp(orderList.get(orderList.size() - 1).getCreateTime(),

                            "yyyy-MM-dd HH:mm:ss"),

                    TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));

            list = UpdateOrderJob.mixTaoBaoOrder(commonOrderList, orderList);

            Collections.sort(list, cm);

            addRelationAndSpecialOrder(list);

        }

    }



@@ -90,11 +128,11 @@
     */

    private void updateSpecialOrder(long startTime) {

        String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");

        List<TaoBaoOrder> orderList = TaoKeApiUtil.getTaoBaoSpecialOrder(startTimeStr, 1, Constant.TAOBAO_AUTH_APPKEY,

        List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoSpecialOrder(startTimeStr, 1, Constant.TAOBAO_AUTH_APPKEY,

                Constant.TAOBAO_AUTH_APPSECRET);

        addRelationAndSpecialOrder(orderList);



        orderList = TaoKeApiUtil.getTaoBaoSpecialThirdOrder(startTimeStr, 1, Constant.TAOBAO_AUTH_APPKEY,

        orderList = TaoKeOrderApiUtil.getTaoBaoSpecialThirdOrder(startTimeStr, 1, Constant.TAOBAO_AUTH_APPKEY,

                Constant.TAOBAO_AUTH_APPSECRET);

        addRelationAndSpecialOrder(orderList);

    }

@@ -106,12 +144,51 @@
     * @param toPage-结束页码（每页20条数据）

     */

    private void updateSpecialOrder(int fromPage, int toPage) {

        // 最近90天的订单

        String startTimeStr = TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 90L,

                "yyyy-MM-dd HH:mm:ss");



        Comparator<TaoBaoOrder> cm = new Comparator<TaoBaoOrder>() {

            @Override

            public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {

                long span = TimeUtil.convertToTimeTemp(o2.getCreateTime(), "yyyy-MM-dd HH:mm:ss")

                        - TimeUtil.convertToTimeTemp(o1.getCreateTime(), "yyyy-MM-dd HH:mm:ss");

                if (span > 0)

                    return 1;

                else if (span == 0)

                    return 0;

                else

                    return -1;

            }

        };



        for (int p = fromPage; p < toPage; p++) {

            List<TaoBaoOrder> orderList = TaoKeApiUtil.getTaoBaoSpecialOrder(startTimeStr, p,

            // 爬取2方订单

            List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoSpecialOrder(startTimeStr, p,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

            addRelationAndSpecialOrder(orderList);

            Collections.sort(orderList, cm);

            List<TaoBaoOrder> commonOrderList = UpdateOrderJob.getCommonOrder(

                    TimeUtil.convertToTimeTemp(orderList.get(orderList.size() - 1).getCreateTime(),

                            "yyyy-MM-dd HH:mm:ss"),

                    TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));



            List<TaoBaoOrder> list = UpdateOrderJob.mixTaoBaoOrder(commonOrderList, orderList);

            Collections.sort(list, cm);

            addRelationAndSpecialOrder(list);



			
            // 爬取三方订单

            orderList = TaoKeOrderApiUtil.getTaoBaoSpecialThirdOrder(startTimeStr, p, Constant.TAOBAO_AUTH_APPKEY,

                    Constant.TAOBAO_AUTH_APPSECRET);

            Collections.sort(orderList, cm);

			
            commonOrderList = UpdateOrderJob.getThirdCommonOrder(

                    TimeUtil.convertToTimeTemp(orderList.get(orderList.size() - 1).getCreateTime(),

                            "yyyy-MM-dd HH:mm:ss"),

                    TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));

            list = UpdateOrderJob.mixTaoBaoOrder(commonOrderList, orderList);

            Collections.sort(list, cm);

            addRelationAndSpecialOrder(list);

        }

    }




 fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoOrderMapper.xml

@@ -74,6 +74,14 @@
        from yeshi_ec_taobao_order where to_auction_id = #{0} order by to_id
        desc limit 1
    </select>
	
    <select id="selectTaoBaoOrderByTradeId" resultMap="BaseResultMap"
        parameterType="java.lang.String">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_taobao_order where to_trade_id = #{0}
    </select>
	
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_taobao_order where to_id = #{id,jdbcType=BIGINT}</delete>
    <delete id="deleteByOrderId" parameterType="java.lang.String">delete from

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -102,6 +102,7 @@
    public void bind(UserInfo worker, UserInfo inviter) throws ThreeSaleException {

        if (worker == null || inviter == null)

            throw new ThreeSaleException(1, "用户信息为空");



        if (worker.getId() == null)// 该用户还不存在

        {

            // 保存用户

@@ -132,6 +133,9 @@
            userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);



        } else {// 是已经存在的用户

            if (worker.getId().longValue() == inviter.getId())

                throw new ThreeSaleException(4, "不能绑定自己");



            worker = userInfoService.selectByPKey(worker.getId());



            // 用户已经存在我们的用户库中


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

@@ -69,18 +69,26 @@
                taoBaoOrderMapper.insertSelective(taoBaoOrder);

            }

        } else {

            boolean hasPayOrder = false;

            for (TaoBaoOrder order : oldOrderList)

                if (order.getOrderState().equalsIgnoreCase("订单付款")) {

                    hasPayOrder = true;

                    break;

                }

            // 删除原来的订单，加入新订单

            if (hasPayOrder) {

            if (StringUtil.isNullOrEmpty(oldOrderList.get(0).getTradeId())) {

                taoBaoOrderMapper.deleteByOrderId(orderId);

                for (TaoBaoOrder taoBaoOrder : list) {

                    taoBaoOrder.setLatestUpdateTime(new Date());

                    taoBaoOrderMapper.insertSelective(taoBaoOrder);

                }

            } else {

                // 按tradeId更新

                for (TaoBaoOrder taoBaoOrder : list) {

                    TaoBaoOrder order = taoBaoOrderMapper.selectTaoBaoOrderByTradeId(taoBaoOrder.getTradeId());

                    if (order == null) {

                        taoBaoOrder.setLatestUpdateTime(new Date());

                        taoBaoOrderMapper.insertSelective(taoBaoOrder);

                    } else {

                        taoBaoOrder.setId(order.getId());

                        taoBaoOrder.setRelationId(order.getRelationId());

                        taoBaoOrder.setSpecialId(order.getSpecialId());

                        taoBaoOrder.setLatestUpdateTime(new Date());

                        taoBaoOrderMapper.updateByPrimaryKeySelective(taoBaoOrder);

                    }

                }

            }

        }

@@ -91,10 +99,24 @@
        return taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId);

    }





    @Override

    public double countEstimate(String date) throws Exception {

        return taoBaoOrderMapper.countEstimate(date);

    }



    @Override

    public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId) {

        if (StringUtil.isNullOrEmpty(specialId) && StringUtil.isNullOrEmpty(realtionId))

            return;

        TaoBaoOrder order = taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);

        if (order != null) {

            TaoBaoOrder update = new TaoBaoOrder();

            update.setId(order.getId());

            update.setSpecialId(specialId);

            update.setRelationId(realtionId);

            update.setLatestUpdateTime(new Date());

            taoBaoOrderMapper.updateByPrimaryKeySelective(update);

        }

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java

@@ -37,12 +37,22 @@
     */

    public List<TaoBaoOrder> getTaoBaoOrderByOrderId(String orderId);



	
    /**

     * 统计当日预估收益

     * @param date  2018-09-01

     * 
     * @param date

     *            2018-09-01

     * @return

     */

    public double countEstimate(String date) throws Exception;



    /**

     * 绑定会员运营ID与渠道ID(根据交易ID)

     * 
     * @param tadeId

     * @param specialId

     * @param realtionId

     */

    public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId);



}


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

@@ -1625,300 +1625,6 @@
        return null;

    }



    /**

     * 获取会员订单

     * 
     * @param startTime-开始时间

     * @param page-页码

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, int page, String appKey, String appSecret) {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.order.get");

        map.put("fields",

                "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");

        map.put("start_time", startTime);

        map.put("tk_status", "1");

        map.put("order_query_type", "create_time");

        map.put("order_scene", "3");

        map.put("page_no", page + "");

        map.put("page_size", 100 + "");



        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(appKey);

        app.setAppSecret(appSecret);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

            System.out.println(json.toString());

            return parseTaoBaoOrder(json.toString());

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }

        return null;

    }



    /**

     * 获取第三方会员订单

     * 
     * @param startTime

     * @param page

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoSpecialThirdOrder(String startTime, int page, String appKey,

            String appSecret) {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.order.get");

        map.put("fields",

                "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");

        map.put("start_time", startTime);

        map.put("tk_status", "1");

        map.put("order_query_type", "create_time");

        map.put("order_scene", "3");

        map.put("page_no", page + "");

        map.put("page_size", 100 + "");

        map.put("order_count_type", "2");



        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(appKey);

        app.setAppSecret(appSecret);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

            System.out.println(json.toString());

            return parseTaoBaoOrder(json.toString());

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }

        return null;

    }



    /**

     * 获取渠道订单

     * 
     * @param startTime

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, int page, String appKey,

            String appSecret) {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.order.get");

        map.put("fields",

                "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");

        map.put("start_time", startTime);

        map.put("span", "1200");

        map.put("tk_status", "1");

        map.put("order_query_type", "create_time");

        map.put("order_scene", "2");

        map.put("page_no", page + "");

        map.put("page_size", 100 + "");



        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(appKey);

        app.setAppSecret(appSecret);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);



            return parseTaoBaoOrder(json.toString());

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }



        return null;

    }



    /**

     * 第三方渠道订单

     * 
     * @param startTime

     * @param page

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoRelationThirdOrder(String startTime, int page, String appKey,

            String appSecret) {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.order.get");

        map.put("fields",

                "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");

        map.put("start_time", startTime);

        map.put("span", "1200");

        map.put("tk_status", "1");

        map.put("order_query_type", "create_time");

        map.put("order_scene", "2");

        map.put("page_no", page + "");

        map.put("page_size", 100 + "");

        map.put("order_count_type", "2");



        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(appKey);

        app.setAppSecret(appSecret);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

            return parseTaoBaoOrder(json.toString());

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }

        return null;

    }



    /**

     * 获取所有的订单（不带渠道信息与会员信息）

     * 
     * @param startTime

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret) {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.order.get");

        map.put("fields",

                "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");

        map.put("start_time", startTime);

        map.put("span", "1200");

        map.put("tk_status", "1");

        map.put("order_query_type", "create_time");

        map.put("order_scene", "1");// 所有订单

        map.put("page_no", 1 + "");

        map.put("page_size", 100 + "");



        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(appKey);

        app.setAppSecret(appSecret);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

            return parseTaoBaoOrder(json.toString());

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }



        return null;

    }

	
	
    public static void punish()

    {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.dg.punish.order.get");

        map.put("span", "3600");

        map.put("page_no", "1");

        map.put("page_size", "20");

        map.put("start_time", "2019-01-01 00:00:00");

//        map.put("start_time", "2019-01-01 00:00:00");

        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(Constant.TAOBAO_AUTH_APPKEY);

        app.setAppSecret(Constant.TAOBAO_AUTH_APPSECRET);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }

    }



    private static List<TaoBaoOrder> parseTaoBaoOrder(String response) {



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



        JSONObject data = JSONObject.fromObject(response);

        if (data.optJSONObject("tbk_order_get_response") == null)

            return orderList;

        if (data.optJSONObject("tbk_order_get_response").optJSONObject("results") == null)

            return orderList;

        if (data.optJSONObject("tbk_order_get_response").optJSONObject("results").optJSONArray("n_tbk_order") == null)

            return orderList;



        JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")

                .optJSONArray("n_tbk_order");

        for (int i = 0; i < array.size(); i++) {



            JSONObject item = array.optJSONObject(i);

            try {

                TaoBaoOrder taoBaoOrder = new TaoBaoOrder();

                taoBaoOrder.setAdPositionId(item.optString("adzone_id"));

                taoBaoOrder.setAdPositionName(item.optString("adzone_name"));

                taoBaoOrder.setAuctionId(item.optLong("num_iid"));

                taoBaoOrder.setClassName(item.optString("auction_category"));

                taoBaoOrder.setClickTime(item.optString("click_time"));

                taoBaoOrder.setCount(item.optInt("item_num"));

                taoBaoOrder.setCreateTime(item.optString("create_time"));

                if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))

                    taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));

                else

                    taoBaoOrder.seteIncome(new BigDecimal(0));



                if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))

                    taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));

                else

                    taoBaoOrder.setEstimate(new BigDecimal(0));

                taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));

                taoBaoOrder.setLatestUpdateTime(null);

                taoBaoOrder.setManagerWangWang(null);

                taoBaoOrder.setOrderBy(null);

                taoBaoOrder.setOrderId(item.optString("trade_parent_id"));

                if (item.optInt("tk_status") == 12)

                    taoBaoOrder.setOrderState("订单付款");

                else if (item.optInt("tk_status") == 3)

                    taoBaoOrder.setOrderState("订单结算");

                else if (item.optInt("tk_status") == 13)

                    taoBaoOrder.setOrderState("订单失效");

                else if (item.optInt("tk_status") == 14)

                    taoBaoOrder.setOrderState("订单成功");



                taoBaoOrder.setOrderType(item.optString("order_type"));

                if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))

                    taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));

                else

                    taoBaoOrder.setPayment(new BigDecimal(0));

                taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));

                if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))

                    taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));

                else

                    taoBaoOrder.setSettlement(new BigDecimal(0));

                taoBaoOrder.setSettlementTime(item.optString("earning_time"));

                taoBaoOrder.setShop(item.optString("seller_shop_title"));

                taoBaoOrder.setSourceMediaId(item.optString("site_id"));

                taoBaoOrder.setSourceMediaName(item.optString("site_name"));

                taoBaoOrder.setsRatio(null);

                taoBaoOrder.setSubsidy(null);

                if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))

                    taoBaoOrder.setSubsidyRatio(

                            new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));

                taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));

                taoBaoOrder.setTechnologySupportPercent(null);

                taoBaoOrder.setThirdService(null);

                taoBaoOrder.setTitle(item.optString("item_title"));

                if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))

                    taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));

                else

                    taoBaoOrder.setTkMoney(new BigDecimal(0));

                if (!StringUtil.isNullOrEmpty(item.optString("commission_rate")))

                    taoBaoOrder

                            .setTkRate(new BigDecimal(item.optString("commission_rate")).multiply(new BigDecimal(100)));

                else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))

                    taoBaoOrder.setTkRate(

                            new BigDecimal(item.optString("total_commission_rate")).multiply(new BigDecimal(100)));

                taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));

                taoBaoOrder.setRelationId(item.optString("relation_id"));

                taoBaoOrder.setSpecialId(item.optString("special_id"));

                taoBaoOrder.setTradeId(item.optString("trade_id"));

                orderList.add(taoBaoOrder);

            } catch (Exception e) {

                try {

                    LogHelper.errorDetailInfo(e, "订单号信息:" + item.toString(), "订单解析出错");

                } catch (Exception e1) {

                }

            }

        }



        return orderList;

    }



    public static void specialConvertItem(Long auctionId, TaoKeAppInfo app) {

        String pid = app.getPid();

        String[] sts = pid.split("_");


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

New file
@@ -0,0 +1,324 @@
package com.yeshi.fanli.util.taobao;



import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import com.taobao.api.TaobaoObject;

import com.yeshi.fanli.dto.order.OrderQuery;

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

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

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



//淘宝客API接口

public class TaoKeOrderApiUtil {

    /**

     * 获取会员订单

     * 
     * @param startTime-开始时间

     * @param page-页码

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, int page, String appKey, String appSecret) {

        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.tkStatus = 1;

        orderQuery.orderScene = 3;

        orderQuery.pageNo = page;

        orderQuery.pageSize = 100;

        return queryTaoBaoOrder(orderQuery, appKey, appSecret);

    }



    /**

     * 获取第三方会员订单

     * 
     * @param startTime

     * @param page

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoSpecialThirdOrder(String startTime, int page, String appKey,

            String appSecret) {

        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.tkStatus = 1;

        orderQuery.orderQueryType = "create_time";

        orderQuery.orderScene = 3;

        orderQuery.pageNo = page;

        orderQuery.pageSize = 100;

        orderQuery.orderCountType = 2;

        return queryTaoBaoOrder(orderQuery, appKey, appSecret);

    }



    /**

     * 获取渠道订单

     * 
     * @param startTime

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, int page, String appKey,

            String appSecret) {



        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.span = 1200;

        orderQuery.tkStatus = 1;

        orderQuery.orderQueryType = "create_time";

        orderQuery.orderScene = 2;

        orderQuery.pageNo = page;

        orderQuery.pageSize = 100;

        return queryTaoBaoOrder(orderQuery, appKey, appSecret);

    }



    /**

     * 第三方渠道订单

     * 
     * @param startTime

     * @param page

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoRelationThirdOrder(String startTime, int page, String appKey,

            String appSecret) {

        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.span = 1200;

        orderQuery.tkStatus = 1;

        orderQuery.orderQueryType = "create_time";

        orderQuery.orderScene = 2;

        orderQuery.pageNo = page;

        orderQuery.pageSize = 100;

        orderQuery.orderCountType = 2;

        return queryTaoBaoOrder(orderQuery, appKey, appSecret);

    }



    /**

     * 获取所有的订单（不带渠道信息与会员信息）

     * 
     * @param startTime

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret) {



        return getTaoBaoAllOrder(startTime, 1200, 1, appKey, appSecret);

    }



    public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, int span, int page, String appKey,

            String appSecret) {

        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.span = span;

        orderQuery.tkStatus = 1;

        orderQuery.orderQueryType = "create_time";

        orderQuery.orderScene = 1;

        orderQuery.pageNo = page;

        orderQuery.pageSize = 100;

        orderQuery.orderCountType=2;

        return queryTaoBaoOrder(orderQuery, appKey, appSecret);

    }

	
    /**

     * 获取第三方订单

     * @param startTime

     * @param span

     * @param page

     * @param appKey

     * @param appSecret

     * @return

     */

    public static List<TaoBaoOrder> getTaoBaoThirdAllOrder(String startTime, int span, int page, String appKey,

            String appSecret) {

        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.span = span;

        orderQuery.tkStatus = 1;

        orderQuery.orderQueryType = "create_time";

        orderQuery.orderScene = 1;

        orderQuery.pageNo = page;

        orderQuery.pageSize = 100;

        return queryTaoBaoOrder(orderQuery, appKey, appSecret);

    }



    public static void punish() {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.dg.punish.order.get");

        map.put("span", "3600");

        map.put("page_no", "1");

        map.put("page_size", "20");

        map.put("start_time", "2019-01-01 00:00:00");

        // map.put("start_time", "2019-01-01 00:00:00");

        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(Constant.TAOBAO_AUTH_APPKEY);

        app.setAppSecret(Constant.TAOBAO_AUTH_APPSECRET);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }

    }



    public static void test(String startTime, String appKey, String appSecret) {

        OrderQuery orderQuery = new OrderQuery();

        orderQuery.startTime = startTime;

        orderQuery.span = 1200;

        orderQuery.tkStatus = 1;

        orderQuery.orderQueryType = "create_time";

        orderQuery.orderScene = 1;

        orderQuery.pageNo = 1;

        orderQuery.pageSize = 100;

        List<TaoBaoOrder> list = queryTaoBaoOrder(orderQuery, appKey, appSecret);

        for (TaoBaoOrder order : list)

            System.out.println(order.getCreateTime() + "--" + order.getSettlementTime());

    }



    private static List<TaoBaoOrder> queryTaoBaoOrder(OrderQuery orderQuery, String appKey, String appSecret) {



        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.order.get");

        map.put("fields",

                "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");

        if (orderQuery.startTime != null)

            map.put("start_time", orderQuery.startTime);

        if (orderQuery.span != null)

            map.put("span", orderQuery.span + "");

        map.put("page_no", orderQuery.pageNo + "");

        map.put("page_size", orderQuery.pageSize + "");



        if (orderQuery.tkStatus != null)

            map.put("tk_status", orderQuery.tkStatus + "");

        if (orderQuery.orderQueryType != null)

            map.put("order_query_type", orderQuery.orderQueryType);

        if (orderQuery.orderScene != null)

            map.put("order_scene", orderQuery.orderScene + "");



        if (orderQuery.orderCountType != null)

            map.put("order_count_type", orderQuery.orderCountType + "");



        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey(appKey);

        app.setAppSecret(appSecret);

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);

            return parseTaoBaoOrder(json.toString());

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }



        return null;

    }



    private static List<TaoBaoOrder> parseTaoBaoOrder(String response) {



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



        JSONObject data = JSONObject.fromObject(response);

        if (data.optJSONObject("tbk_order_get_response") == null)

            return orderList;

        if (data.optJSONObject("tbk_order_get_response").optJSONObject("results") == null)

            return orderList;

        if (data.optJSONObject("tbk_order_get_response").optJSONObject("results").optJSONArray("n_tbk_order") == null)

            return orderList;



        JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")

                .optJSONArray("n_tbk_order");

        for (int i = 0; i < array.size(); i++) {



            JSONObject item = array.optJSONObject(i);

            try {

                TaoBaoOrder taoBaoOrder = new TaoBaoOrder();

                taoBaoOrder.setAdPositionId(item.optString("adzone_id"));

                taoBaoOrder.setAdPositionName(item.optString("adzone_name"));

                taoBaoOrder.setAuctionId(item.optLong("num_iid"));

                taoBaoOrder.setClassName(item.optString("auction_category"));

                taoBaoOrder.setClickTime(item.optString("click_time"));

                taoBaoOrder.setCount(item.optInt("item_num"));

                taoBaoOrder.setCreateTime(item.optString("create_time"));

                if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))

                    taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));

                else

                    taoBaoOrder.seteIncome(new BigDecimal(0));



                if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))

                    taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));

                else

                    taoBaoOrder.setEstimate(new BigDecimal(0));

                taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));

                taoBaoOrder.setLatestUpdateTime(null);

                taoBaoOrder.setManagerWangWang(null);

                taoBaoOrder.setOrderBy(null);

                taoBaoOrder.setOrderId(item.optString("trade_parent_id"));

                if (item.optInt("tk_status") == 12)

                    taoBaoOrder.setOrderState("订单付款");

                else if (item.optInt("tk_status") == 3)

                    taoBaoOrder.setOrderState("订单结算");

                else if (item.optInt("tk_status") == 13)

                    taoBaoOrder.setOrderState("订单失效");

                else if (item.optInt("tk_status") == 14)

                    taoBaoOrder.setOrderState("订单成功");



                taoBaoOrder.setOrderType(item.optString("order_type"));

                if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))

                    taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));

                else

                    taoBaoOrder.setPayment(new BigDecimal(0));

                taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));

                if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))

                    taoBaoOrder.setSettlement(new BigDecimal(item.optString("pay_price")));

                else

                    taoBaoOrder.setSettlement(new BigDecimal(0));

                taoBaoOrder.setSettlementTime(item.optString("earning_time"));

                taoBaoOrder.setShop(item.optString("seller_shop_title"));

                taoBaoOrder.setSourceMediaId(item.optString("site_id"));

                taoBaoOrder.setSourceMediaName(item.optString("site_name"));

                taoBaoOrder.setsRatio(null);

                taoBaoOrder.setSubsidy(null);

                if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))

                    taoBaoOrder.setSubsidyRatio(

                            new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));

                taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));

                taoBaoOrder.setTechnologySupportPercent(null);

                taoBaoOrder.setThirdService(null);

                taoBaoOrder.setTitle(item.optString("item_title"));

                if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))

                    taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));

                else

                    taoBaoOrder.setTkMoney(new BigDecimal(0));

                if (!StringUtil.isNullOrEmpty(item.optString("commission_rate")))

                    taoBaoOrder

                            .setTkRate(new BigDecimal(item.optString("commission_rate")).multiply(new BigDecimal(100)));

                else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))

                    taoBaoOrder.setTkRate(

                            new BigDecimal(item.optString("total_commission_rate")).multiply(new BigDecimal(100)));

                taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));

                taoBaoOrder.setRelationId(item.optString("relation_id"));

                taoBaoOrder.setSpecialId(item.optString("special_id"));

                taoBaoOrder.setTradeId(item.optString("trade_id"));

                orderList.add(taoBaoOrder);

            } catch (Exception e) {

                try {

                    LogHelper.errorDetailInfo(e, "订单号信息:" + item.toString(), "订单解析出错");

                } catch (Exception e1) {

                }

            }

        }



        return orderList;

    }



}