大淘客API修复/唯品会订单爬取策略修改

admin

2023-04-12 651f2856e9ae10aacbfb8327d967aacbb6d58333

大淘客API修复/唯品会订单爬取策略修改

 facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java

@@ -742,7 +742,7 @@
        DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
        if (StringUtil.isNullOrEmpty(json.optString("createTime"))) {
            detail.setCreateTime(
                    new Date(TimeUtil.convertToTimeTemp(json.optString("onSaleTime"), "yyyy-MM-dd HH:mm:ss")));
                    new Date(TimeUtil.convertToTimeTemp(json.optString("previewStartTime"), "yyyy-MM-dd HH:mm:ss")));
        } else {
            detail.setCreateTime(
                    new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -464,6 +464,7 @@

    public static class DaoQuery {
        public Integer state;
        public String orderId;
        public Integer sourceType;
        public Date minThirdCreateTime;
        public Date maxThirdCreateTime;

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

@@ -400,8 +400,10 @@
        for (SystemEnum system : SystemEnum.values()) {
            if (!SystemInfoUtil.hasFunctions(system, SystemFunction.faQuan))
                continue;
            if(system!=SystemEnum.blks)
                continue;
            // 好单库
            boolean addResult = addHDKListSelected(system);
            boolean addResult = false;//addHDKListSelected(system);
            // 大淘客备用
            if (!addResult) {
                addDTKFriendsFircleList(system);

 fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java

@@ -40,6 +40,9 @@
    @XxlJob("startPreOrderTeamIncomeHandler")
    public ReturnT<String> startPreOrderTeamIncome(String param) throws Exception {
        String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
        if(!StringUtil.isNullOrEmpty(param)){
            day=param;
        }
        Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
        orderProcessService.fanliPreInvaite(preSendTime);
        return ReturnT.SUCCESS;

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

@@ -5,6 +5,8 @@
import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import org.springframework.stereotype.Component;

@@ -27,14 +29,19 @@
    @XxlJob("order-update-pay-state")
    public ReturnT<String> updatePayState(String param) throws Exception {
        //更新20-25天之前的未处理订单
        List<CommonOrder> resultList = commonOrderService.listPayStateOrder(null,new Date(System.currentTimeMillis() - 1000*60*60*24L*25),new Date(System.currentTimeMillis() - 1000*60*60*24L*20),1,500);
        for(CommonOrder co : resultList){
            OrdersCMQManager.getInstance().addOrder(new CommonOrderMQMsg(co.getOrderNo(),co.getSourceType()));
        List<CommonOrder> resultList = null;
        if (!StringUtil.isNullOrEmpty(param)) {
            if (param.length() > 1) {
                resultList = commonOrderService.getByOrderNo(null, param);
            } else {
                resultList = commonOrderService.listPayStateOrder(Integer.parseInt(param), new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 25), new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 10), 1, 500);
            }
        } else {
            resultList = commonOrderService.listPayStateOrder(null, new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 25), new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 20), 1, 500);
        }
        for (CommonOrder co : resultList) {
            OrdersCMQManager.getInstance().addOrder(new CommonOrderMQMsg(co.getOrderNo(), co.getSourceType()));
        }
        return ReturnT.SUCCESS;
    }




}

 fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java

@@ -60,7 +60,7 @@
                String result = redisManager.getCommonString(key);
                // 判断
//                if (StringUtil.isNullOrEmpty(result)) {
                OrdersCMQManager.getInstance().addOrder(new CommonOrderMQMsg(order.getOrderSn() + "",Constant.SOURCE_TYPE_VIP));
                OrdersCMQManager.getInstance().addOrder(new CommonOrderMQMsg(order.getOrderSn() + "", Constant.SOURCE_TYPE_VIP));
                redisManager.cacheCommonString(key, "1", 60 * 60 * 2);// 2小时内不再更新
                LogHelper.test("唯品会订单消息发送成功");
//                }else{
@@ -84,8 +84,19 @@
            updateByOrderTime(endTime - 1000 * 60 * 60 * 1L, endTime);
            updateByUpdateTime(endTime - 1000 * 60 * 60 * 1L, endTime);
        } else if ("1day".equalsIgnoreCase(param)) {// 更新最近1天更新的数据
            updateByOrderTime(endTime - 1000 * 60 * 60 * 24L, endTime);
            updateByUpdateTime(endTime - 1000 * 60 * 60 * 24L, endTime);
            Long startT = endTime - 1000 * 60 * 60 * 24L;
            for(long start= startT;start<startT +1000 * 60 * 60 * 24L;start+=1000 * 60 * 60 ) {
                updateByOrderTime(start, start + 1000 * 60 * 60 );
                updateByUpdateTime(start, start + 1000 * 60 * 60 );
            }
        } else if ("1month".equalsIgnoreCase(param)) {// 更新最近1个月的数据
            for (int i = 0; i < 30; i++) {
                Long startT = endTime - 1000 * 60 * 60 * 24L*(i+1);
               for(long start= startT;start<startT +1000 * 60 * 60 * 24L;start+=1000 * 60 * 60 ) {
                   updateByOrderTime(start, start + 1000 * 60 * 60 );
                   updateByUpdateTime(start, start + 1000 * 60 * 60 );
               }
            }
        }
        /*
         * else if ("3day".equalsIgnoreCase(param)) {// 更新最近3天更新的数据
@@ -129,7 +140,7 @@
    @XxlJob("order-vip-updateByLongTimeNoUpdate")
    public ReturnT<String> updateByLongTimeNoUpdate(String param) throws Exception {

        List<CommonOrder> commonOrders = commonOrderService.listPayStateOrder(Constant.SOURCE_TYPE_VIP, new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 60), new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 10),1,200);
        List<CommonOrder> commonOrders = commonOrderService.listPayStateOrder(Constant.SOURCE_TYPE_VIP, new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 60), new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 10), 1, 200);
        if (commonOrders == null || commonOrders.size() == 0) {
            throw new Exception("没有需要更新的订单");
        }

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java

@@ -2189,7 +2189,7 @@
        // 生成口令
        String token = null;
        try {
            TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(system, Constant.LINK_TOKEN_VERIFY_UID, goodsBrief.getAuctionId(), "1", null);
            TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(system, Constant.LINK_TOKEN_VERIFY_UID, goodsBrief.getAuctionId(), Constant.LINK_TOKEN_VERIFY_RELATION_ID, null);
            token = taoBaoLink.getTaoToken();
        } catch (TaoBaoConvertLinkException e) {
            e.printStackTrace();

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -1956,7 +1956,13 @@

    @Override
    public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
        return commonOrderMapper.getByOrderNo(uid, orderNO);
        if(uid!=null) {
            return commonOrderMapper.getByOrderNo(uid, orderNO);
        }else{
            CommonOrderMapper.DaoQuery daoQuery=new CommonOrderMapper.DaoQuery();
            daoQuery.orderId = orderNO;
            return  commonOrderMapper.list(daoQuery,0,100);
        }
    }



 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -39,6 +39,8 @@
    // 验证文本口令或链接uid
    public static Long LINK_TOKEN_VERIFY_UID = 437032L;

    public static String LINK_TOKEN_VERIFY_RELATION_ID = "20211660";

    public static String YINGYONGBAO_LINK = "https://w.url.cn/s/AHUuT7i";

    public final static String UIDAESKEY = "WW782ss@8*px/%2v";

 fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/TDMQUtil.java

@@ -193,6 +193,7 @@
        request.setQueueName(queueName);
        request.setMsgContent(msg);
        request.setDelaySeconds(delaySeconds);

        try {
            SendCmqMsgResponse response = getMsgClient().SendCmqMsg(request);
            return response.getMsgId();
@@ -202,6 +203,7 @@
        return null;
    }


    public String sendMsg(String queueName, String msg) {
        return this.sendMsg(queueName, msg, 0L);
    }

 fanli/src/main/java/com/yeshi/fanli/util/vipshop/DingDanXiaApiUtil.java

@@ -162,7 +162,7 @@

//        String result = getAcessTokenInfo("576a51ae7b9b4db1bbfc921cf381ac0c", "1234");
//        System.out.println(result);
        VipShopOrder order = getOrderDetail("21110371888533");
        VipShopOrder order = getOrderDetail("23022226147872");
        System.out.println(order);
    }


 fanli/src/main/resource/dubbo/consumer.xml

@@ -11,8 +11,8 @@

    <dubbo:annotation package="com.yeshi.fanli"></dubbo:annotation>

    <dubbo:registry  address="zookeeper://172.16.16.46:2181"/>
    <!--<dubbo:registry  address="zookeeper://193.112.35.168:2182"/>-->
    <!--<dubbo:registry  address="zookeeper://172.16.16.46:2181"/>-->
    <dubbo:registry  address="zookeeper://193.112.35.168:2182"/>

    <!-- url=dubbo://192.168.3.122:20882/com.yeshi.goods.facade.service.TaoBaoCouponCacheService -->


 fanli/src/main/resource/mapping/order/CommonOrderMapper.xml

@@ -241,6 +241,9 @@
        <if test="query.state!=null">
            and co_state=#{query.state}
        </if>
        <if test="query.orderId!=null">
            and co_order_no=#{query.orderId}
        </if>

        <if test="query.minThirdCreateTime!=null">
            and co_third_create_time>=#{query.minThirdCreateTime}