爬单修改

admin

2019-04-01 e782b2bcfd89f7ce2e3079c7ebb0867bb00124a7

爬单修改

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

@@ -74,5 +74,12 @@
    List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
            @Param("startTime")String startTime, @Param("endTime")String endTime);
    

	
    /**
     * 获取长期未更新的订单
     * @param start
     * @param count
     * @return
     */
    List<TaoBaoOrder> listLongTimeNoUpdateOrders(@Param("start")long start,@Param("count")int count);
}

 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java

@@ -57,6 +57,8 @@
    private String videoCover;

    @Column(name = "cg_video_url")

    private String videoUrl;

    @Column(name = "cg_material_lib_type")

    private Integer materialLibType;// 物料库类型 1-营销商品库 0-非营销商品库

    @Column(name = "cg_createtime")

    private Date createTime;

    @Column(name = "cg_updatetime")

@@ -93,6 +95,14 @@
        this.goodsId = goodsId;

    }



    public Integer getMaterialLibType() {

        return materialLibType;

    }



    public void setMaterialLibType(Integer materialLibType) {

        this.materialLibType = materialLibType;

    }



    public Integer getGoodsType() {

        return goodsType;

    }


 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java

@@ -268,6 +268,7 @@
    @Column

    private Integer state;// 0-正常 1-商品下架

    

    @org.yeshi.utils.mybatis.Column(name = "material_lib_type")

    @Transient

    private Integer materialLibType;//物料库类型

    


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

@@ -10,6 +10,7 @@


import org.springframework.scheduling.annotation.Scheduled;



import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;

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

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

import com.yeshi.fanli.log.LogHelper;

@@ -20,6 +21,7 @@
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.BeanUtil;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -62,6 +64,9 @@


    @Resource

    private OrderService orderService;



    @Resource

    private TaoBaoOrderMapper taoBaoOrderMapper;



    /**

     * 新版获取普通订单

@@ -207,4 +212,20 @@
        addOrderNew(orderList);

    }



    // 每晚10点执行漏单

    @Scheduled(cron = "0 0 22 * * ? ")

    public void doJob3() {

        List<TaoBaoOrder> orderList = taoBaoOrderMapper.listLongTimeNoUpdateOrders(0, 10);

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

        for (TaoBaoOrder order : orderList) {

            List<TaoBaoOrder> newList = TaoKeOrderApiUtil.getTaoBaoAllOrder(order.getCreateTime(), 60, 1,

                    Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

            for (TaoBaoOrder o : newList) {

                if (o.getOrderId().equalsIgnoreCase(order.getOrderId()))

                    updateOrderList.add(o);

            }

        }

        addOrderNew(updateOrderList);

    }



}


 fanli/src/main/java/com/yeshi/fanli/mapping/goods/CommonGoodsMapper.xml

@@ -13,7 +13,8 @@
        <result column="cg_sales" property="sales" jdbcType="INTEGER" />
        <result column="cg_rate" property="rate" jdbcType="DECIMAL" />
        <result column="cg_picture" property="picture" jdbcType="VARCHAR" />
        <result column="cg_picture_white" property="pictureWhite" jdbcType="VARCHAR" />
        <result column="cg_picture_white" property="pictureWhite"
            jdbcType="VARCHAR" />
        <result column="cg_state" property="state" jdbcType="INTEGER" />
        <result column="cg_price" property="price" jdbcType="DECIMAL" />
        <result column="cg_coupon_info" property="couponInfo" jdbcType="VARCHAR" />
@@ -29,8 +30,10 @@
        <result column="cg_video_url" property="videoUrl" jdbcType="VARCHAR" />
        <result column="cg_createtime" property="createTime" jdbcType="TIMESTAMP" />
        <result column="cg_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
        <result column="cg_material_lib_type" property="materialLibType"
            jdbcType="INTEGER" />
    </resultMap>
    <sql id="Base_Column_List">cg_id,cg_title,cg_goods_id,cg_goods_type,cg_shop_type,cg_seller_id,cg_seller_name,cg_sales,cg_rate,cg_picture,cg_picture_white,cg_state,cg_price,cg_coupon_info,cg_coupon_startprice,cg_coupon_amount,cg_coupon_left_count,cg_coupon_total_count,cg_video_cover,cg_video_url,cg_createtime,cg_updatetime
    <sql id="Base_Column_List">cg_id,cg_title,cg_goods_id,cg_goods_type,cg_shop_type,cg_seller_id,cg_seller_name,cg_sales,cg_rate,cg_picture,cg_picture_white,cg_state,cg_price,cg_coupon_info,cg_coupon_startprice,cg_coupon_amount,cg_coupon_left_count,cg_coupon_total_count,cg_video_cover,cg_video_url,cg_createtime,cg_updatetime,cg_material_lib_type
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
@@ -38,24 +41,19 @@
        <include refid="Base_Column_List" />
        from yeshi_ec_common_goods where cg_id = #{id,jdbcType=BIGINT}
    </select>

    <select id="selectByGoodsIdAndGoodsType" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_common_goods where cg_goods_id = #{goodsId} and
        cg_goods_type=#{goodsType}
    </select>



    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_common_goods where cg_id = #{id,jdbcType=BIGINT}
    </delete>
        yeshi_ec_common_goods where cg_id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.goods.CommonGoods"
        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_common_goods
        (cg_id,cg_title,cg_goods_id,cg_goods_type,cg_shop_type,cg_seller_id,cg_seller_name,cg_sales,cg_rate,cg_picture,cg_picture_white,cg_state,cg_price,cg_coupon_info,cg_coupon_startprice,cg_coupon_amount,cg_coupon_left_count,cg_coupon_total_count,cg_video_cover,cg_video_url,cg_createtime,cg_updatetime)
        (cg_id,cg_title,cg_goods_id,cg_goods_type,cg_shop_type,cg_seller_id,cg_seller_name,cg_sales,cg_rate,cg_picture,cg_picture_white,cg_state,cg_price,cg_coupon_info,cg_coupon_startprice,cg_coupon_amount,cg_coupon_left_count,cg_coupon_total_count,cg_video_cover,cg_video_url,cg_createtime,cg_updatetime,cg_material_lib_type)
        values
        (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{goodsId,jdbcType=BIGINT},#{goodsType,jdbcType=INTEGER},#{shopType,jdbcType=INTEGER},#{sellerId,jdbcType=BIGINT},#{sellerName,jdbcType=VARCHAR},#{sales,jdbcType=INTEGER},#{rate,jdbcType=DECIMAL},#{picture,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{price,jdbcType=DECIMAL},#{couponInfo,jdbcType=VARCHAR},#{couponStartPrice,jdbcType=DECIMAL},#{couponAmount,jdbcType=DECIMAL},#{couponLeftCount,jdbcType=INTEGER},#{couponTotalCount,jdbcType=INTEGER},#{videoCover,jdbcType=VARCHAR},#{videoUrl,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
        (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{goodsId,jdbcType=BIGINT},#{goodsType,jdbcType=INTEGER},#{shopType,jdbcType=INTEGER},#{sellerId,jdbcType=BIGINT},#{sellerName,jdbcType=VARCHAR},#{sales,jdbcType=INTEGER},#{rate,jdbcType=DECIMAL},#{picture,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{price,jdbcType=DECIMAL},#{couponInfo,jdbcType=VARCHAR},#{couponStartPrice,jdbcType=DECIMAL},#{couponAmount,jdbcType=DECIMAL},#{couponLeftCount,jdbcType=INTEGER},#{couponTotalCount,jdbcType=INTEGER},#{videoCover,jdbcType=VARCHAR},#{videoUrl,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{materialLibType,jdbcType=INTEGER})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.goods.CommonGoods"
        useGeneratedKeys="true" keyProperty="id">
@@ -83,6 +81,7 @@
            <if test="videoUrl != null">cg_video_url,</if>
            <if test="createTime != null">cg_createtime,</if>
            <if test="updateTime != null">cg_updatetime,</if>
            <if test="materialLibType != null">cg_material_lib_type,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -108,6 +107,7 @@
            <if test="videoUrl != null">#{videoUrl,jdbcType=VARCHAR},</if>
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
            <if test="materialLibType != null">#{materialLibType,jdbcType=INTEGER}</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.goods.CommonGoods">update
@@ -132,8 +132,9 @@
        #{videoCover,jdbcType=VARCHAR},cg_video_url =
        #{videoUrl,jdbcType=VARCHAR},cg_createtime =
        #{createTime,jdbcType=TIMESTAMP},cg_updatetime =
        #{updateTime,jdbcType=TIMESTAMP} where cg_id = #{id,jdbcType=BIGINT}
    </update>
        #{updateTime,jdbcType=TIMESTAMP} ,cg_material_lib_type
        =#{materialLibType,jdbcType=INTEGER} where cg_id =
        #{id,jdbcType=BIGINT}</update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.goods.CommonGoods">
        update yeshi_ec_common_goods
        <set>
@@ -161,6 +162,9 @@
            <if test="videoUrl != null">cg_video_url=#{videoUrl,jdbcType=VARCHAR},</if>
            <if test="createTime != null">cg_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">cg_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
            <if test="id !=null">cg_id =#{id,jdbcType=BIGINT},</if>
            <if test="materialLibType !=null">cg_material_lib_type
                =#{materialLibType,jdbcType=INTEGER},</if>
        </set>
        where cg_id = #{id,jdbcType=BIGINT}
    </update>

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

@@ -69,8 +69,10 @@
        <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
        <result column="state" property="state" jdbcType="INTEGER" />
        <result column="totalSales" property="totalSales" jdbcType="INTEGER" />
        <result column="material_lib_type" property="materialLibType"
            jdbcType="INTEGER" />
    </resultMap>
    <sql id="Base_Column_List">id,rootCatId,eventCreatorId,leafCatId,debugInfo,rootCatScore,sellerId,userType,shopTitle,pictUrl,pictUrlWhite,title,auctionId,couponLink,couponLinkTaoToken,couponActivityId,biz30day,tkRate,nick,includeDxjh,reservePrice,tkCommFee,totalFee,totalNum,zkPrice,dayLeft,tk3rdRate,auctionUrl,rlRate,hasRecommended,hasSame,sameItemPid,couponTotalCount,couponLeftCount,couponAmount,eventRate,couponShortLink,couponInfo,couponStartFee,couponEffectiveStartTime,couponEffectiveEndTime,hasUmpBonus,isBizActivity,umpBonus,rootCategoryName,couponOriLink,userTypeName,createtime,tkMktStatus,updatetime,state,totalSales
    <sql id="Base_Column_List">id,rootCatId,eventCreatorId,leafCatId,debugInfo,rootCatScore,sellerId,userType,shopTitle,pictUrl,pictUrlWhite,title,auctionId,couponLink,couponLinkTaoToken,couponActivityId,biz30day,tkRate,nick,includeDxjh,reservePrice,tkCommFee,totalFee,totalNum,zkPrice,dayLeft,tk3rdRate,auctionUrl,rlRate,hasRecommended,hasSame,sameItemPid,couponTotalCount,couponLeftCount,couponAmount,eventRate,couponShortLink,couponInfo,couponStartFee,couponEffectiveStartTime,couponEffectiveEndTime,hasUmpBonus,isBizActivity,umpBonus,rootCategoryName,couponOriLink,userTypeName,createtime,tkMktStatus,updatetime,state,totalSales,material_lib_type
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
@@ -124,11 +126,13 @@
    </delete>




    <insert id="insert" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief"
        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_taobao_goods
        (id,rootCatId,eventCreatorId,leafCatId,debugInfo,rootCatScore,sellerId,userType,shopTitle,pictUrl,pictUrlWhite,title,auctionId,couponLink,couponLinkTaoToken,couponActivityId,biz30day,tkRate,nick,includeDxjh,reservePrice,tkCommFee,totalFee,totalNum,zkPrice,dayLeft,tk3rdRate,auctionUrl,rlRate,hasRecommended,hasSame,sameItemPid,couponTotalCount,couponLeftCount,couponAmount,eventRate,couponShortLink,couponInfo,couponStartFee,couponEffectiveStartTime,couponEffectiveEndTime,hasUmpBonus,isBizActivity,umpBonus,rootCategoryName,couponOriLink,userTypeName,createtime,tkMktStatus,updatetime,state,totalSales)
        (id,rootCatId,eventCreatorId,leafCatId,debugInfo,rootCatScore,sellerId,userType,shopTitle,pictUrl,pictUrlWhite,title,auctionId,couponLink,couponLinkTaoToken,couponActivityId,biz30day,tkRate,nick,includeDxjh,reservePrice,tkCommFee,totalFee,totalNum,zkPrice,dayLeft,tk3rdRate,auctionUrl,rlRate,hasRecommended,hasSame,sameItemPid,couponTotalCount,couponLeftCount,couponAmount,eventRate,couponShortLink,couponInfo,couponStartFee,couponEffectiveStartTime,couponEffectiveEndTime,hasUmpBonus,isBizActivity,umpBonus,rootCategoryName,couponOriLink,userTypeName,createtime,tkMktStatus,updatetime,state,totalSales,material_lib_type)
        values
        (#{id,jdbcType=BIGINT},#{rootCatId,jdbcType=INTEGER},#{eventCreatorId,jdbcType=INTEGER},#{leafCatId,jdbcType=INTEGER},#{debugInfo,jdbcType=VARCHAR},#{rootCatScore,jdbcType=INTEGER},#{sellerId,jdbcType=BIGINT},#{userType,jdbcType=INTEGER},#{shopTitle,jdbcType=VARCHAR},#{pictUrl,jdbcType=VARCHAR},#{pictUrlWhite,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{auctionId,jdbcType=BIGINT},#{couponLink,jdbcType=VARCHAR},#{couponLinkTaoToken,jdbcType=VARCHAR},#{couponActivityId,jdbcType=VARCHAR},#{biz30day,jdbcType=INTEGER},#{tkRate,jdbcType=DECIMAL},#{nick,jdbcType=VARCHAR},#{includeDxjh,jdbcType=INTEGER},#{reservePrice,jdbcType=DECIMAL},#{tkCommFee,jdbcType=DECIMAL},#{totalFee,jdbcType=DECIMAL},#{totalNum,jdbcType=INTEGER},#{zkPrice,jdbcType=DECIMAL},#{dayLeft,jdbcType=INTEGER},#{tk3rdRate,jdbcType=VARCHAR},#{auctionUrl,jdbcType=VARCHAR},#{rlRate,jdbcType=DECIMAL},#{hasRecommended,jdbcType=INTEGER},#{hasSame,jdbcType=INTEGER},#{sameItemPid,jdbcType=BIGINT},#{couponTotalCount,jdbcType=INTEGER},#{couponLeftCount,jdbcType=INTEGER},#{couponAmount,jdbcType=DECIMAL},#{eventRate,jdbcType=VARCHAR},#{couponShortLink,jdbcType=VARCHAR},#{couponInfo,jdbcType=VARCHAR},#{couponStartFee,jdbcType=DECIMAL},#{couponEffectiveStartTime,jdbcType=VARCHAR},#{couponEffectiveEndTime,jdbcType=VARCHAR},#{hasUmpBonus,jdbcType=VARCHAR},#{isBizActivity,jdbcType=VARCHAR},#{umpBonus,jdbcType=VARCHAR},#{rootCategoryName,jdbcType=VARCHAR},#{couponOriLink,jdbcType=VARCHAR},#{userTypeName,jdbcType=VARCHAR},#{createtime,jdbcType=TIMESTAMP},#{tkMktStatus,jdbcType=VARCHAR},#{updatetime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER},#{totalSales,jdbcType=INTEGER})
        (#{id,jdbcType=BIGINT},#{rootCatId,jdbcType=INTEGER},#{eventCreatorId,jdbcType=INTEGER},#{leafCatId,jdbcType=INTEGER},#{debugInfo,jdbcType=VARCHAR},#{rootCatScore,jdbcType=INTEGER},#{sellerId,jdbcType=BIGINT},#{userType,jdbcType=INTEGER},#{shopTitle,jdbcType=VARCHAR},#{pictUrl,jdbcType=VARCHAR},#{pictUrlWhite,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{auctionId,jdbcType=BIGINT},#{couponLink,jdbcType=VARCHAR},#{couponLinkTaoToken,jdbcType=VARCHAR},#{couponActivityId,jdbcType=VARCHAR},#{biz30day,jdbcType=INTEGER},#{tkRate,jdbcType=DECIMAL},#{nick,jdbcType=VARCHAR},#{includeDxjh,jdbcType=INTEGER},#{reservePrice,jdbcType=DECIMAL},#{tkCommFee,jdbcType=DECIMAL},#{totalFee,jdbcType=DECIMAL},#{totalNum,jdbcType=INTEGER},#{zkPrice,jdbcType=DECIMAL},#{dayLeft,jdbcType=INTEGER},#{tk3rdRate,jdbcType=VARCHAR},#{auctionUrl,jdbcType=VARCHAR},#{rlRate,jdbcType=DECIMAL},#{hasRecommended,jdbcType=INTEGER},#{hasSame,jdbcType=INTEGER},#{sameItemPid,jdbcType=BIGINT},#{couponTotalCount,jdbcType=INTEGER},#{couponLeftCount,jdbcType=INTEGER},#{couponAmount,jdbcType=DECIMAL},#{eventRate,jdbcType=VARCHAR},#{couponShortLink,jdbcType=VARCHAR},#{couponInfo,jdbcType=VARCHAR},#{couponStartFee,jdbcType=DECIMAL},#{couponEffectiveStartTime,jdbcType=VARCHAR},#{couponEffectiveEndTime,jdbcType=VARCHAR},#{hasUmpBonus,jdbcType=VARCHAR},#{isBizActivity,jdbcType=VARCHAR},#{umpBonus,jdbcType=VARCHAR},#{rootCategoryName,jdbcType=VARCHAR},#{couponOriLink,jdbcType=VARCHAR},#{userTypeName,jdbcType=VARCHAR},#{createtime,jdbcType=TIMESTAMP},#{tkMktStatus,jdbcType=VARCHAR},#{updatetime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER},#{totalSales,jdbcType=INTEGER},#{materialLibType,jdbcType=INTEGER})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief"
        useGeneratedKeys="true" keyProperty="id">
@@ -186,6 +190,7 @@
            <if test="updatetime != null">updatetime,</if>
            <if test="state != null">state,</if>
            <if test="totalSales != null">totalSales,</if>
            <if test="materialLibType != null">material_lib_type,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -241,62 +246,104 @@
            <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
            <if test="state != null">#{state,jdbcType=INTEGER}</if>
            <if test="totalSales != null">#{totalSales,jdbcType=INTEGER}</if>
            <if test="materialLibType != null">#{materialLibType,jdbcType=INTEGER}</if>
			
						
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief">update
        yeshi_ec_taobao_goods set 
        rootCatId =    #{rootCatId,jdbcType=INTEGER},
        eventCreatorId = #{eventCreatorId,jdbcType=INTEGER},
        leafCatId =    #{leafCatId,jdbcType=INTEGER},
        debugInfo =    #{debugInfo,jdbcType=VARCHAR},
        rootCatScore = #{rootCatScore,jdbcType=INTEGER},
        sellerId = #{sellerId,jdbcType=BIGINT},
        yeshi_ec_taobao_goods set
        rootCatId = #{rootCatId,jdbcType=INTEGER},
        eventCreatorId =
        #{eventCreatorId,jdbcType=INTEGER},
        leafCatId =
        #{leafCatId,jdbcType=INTEGER},
        debugInfo =
        #{debugInfo,jdbcType=VARCHAR},
        rootCatScore =
        #{rootCatScore,jdbcType=INTEGER},
        sellerId =
        #{sellerId,jdbcType=BIGINT},
        userType = #{userType,jdbcType=INTEGER},
        shopTitle = #{shopTitle,jdbcType=VARCHAR},
        pictUrl = #{pictUrl,jdbcType=VARCHAR},
        pictUrlWhite = #{pictUrlWhite,jdbcType=VARCHAR},
        title =    #{title,jdbcType=VARCHAR},
        auctionId =    #{auctionId,jdbcType=BIGINT},
        couponLink = #{couponLink,jdbcType=VARCHAR},
        couponLinkTaoToken = #{couponLinkTaoToken,jdbcType=VARCHAR},
        couponActivityId = #{couponActivityId,jdbcType=VARCHAR},
        biz30day = #{biz30day,jdbcType=INTEGER},
        pictUrl =
        #{pictUrl,jdbcType=VARCHAR},
        pictUrlWhite =
        #{pictUrlWhite,jdbcType=VARCHAR},
        title = #{title,jdbcType=VARCHAR},
        auctionId = #{auctionId,jdbcType=BIGINT},
        couponLink =
        #{couponLink,jdbcType=VARCHAR},
        couponLinkTaoToken =
        #{couponLinkTaoToken,jdbcType=VARCHAR},
        couponActivityId =
        #{couponActivityId,jdbcType=VARCHAR},
        biz30day =
        #{biz30day,jdbcType=INTEGER},
        tkRate = #{tkRate,jdbcType=DECIMAL},
        nick = #{nick,jdbcType=VARCHAR},
        includeDxjh = #{includeDxjh,jdbcType=INTEGER},
        reservePrice = #{reservePrice,jdbcType=DECIMAL},
        tkCommFee = #{tkCommFee,jdbcType=DECIMAL},
        nick
        = #{nick,jdbcType=VARCHAR},
        includeDxjh =
        #{includeDxjh,jdbcType=INTEGER},
        reservePrice =
        #{reservePrice,jdbcType=DECIMAL},
        tkCommFee =
        #{tkCommFee,jdbcType=DECIMAL},
        totalFee = #{totalFee,jdbcType=DECIMAL},
        totalNum = #{totalNum,jdbcType=INTEGER},
        zkPrice = #{zkPrice,jdbcType=DECIMAL},
        zkPrice =
        #{zkPrice,jdbcType=DECIMAL},
        dayLeft = #{dayLeft,jdbcType=INTEGER},
        tk3rdRate = #{tk3rdRate,jdbcType=VARCHAR},
        auctionUrl = #{auctionUrl,jdbcType=VARCHAR},
        auctionUrl =
        #{auctionUrl,jdbcType=VARCHAR},
        rlRate = #{rlRate,jdbcType=DECIMAL},
        hasRecommended = #{hasRecommended,jdbcType=INTEGER},
        hasSame = #{hasSame,jdbcType=INTEGER},
        sameItemPid = #{sameItemPid,jdbcType=BIGINT},
        couponTotalCount = #{couponTotalCount,jdbcType=INTEGER},
        couponLeftCount = #{couponLeftCount,jdbcType=INTEGER},
        couponAmount = #{couponAmount,jdbcType=DECIMAL},
        eventRate = #{eventRate,jdbcType=VARCHAR},
        couponShortLink = #{couponShortLink,jdbcType=VARCHAR},
        couponInfo = #{couponInfo,jdbcType=VARCHAR},
        couponStartFee = #{couponStartFee,jdbcType=DECIMAL},
        couponEffectiveStartTime = #{couponEffectiveStartTime,jdbcType=VARCHAR},
        couponEffectiveEndTime = #{couponEffectiveEndTime,jdbcType=VARCHAR},
        hasUmpBonus = #{hasUmpBonus,jdbcType=VARCHAR},
        isBizActivity =    #{isBizActivity,jdbcType=VARCHAR},
        umpBonus = #{umpBonus,jdbcType=VARCHAR},
        rootCategoryName = #{rootCategoryName,jdbcType=VARCHAR},
        ]couponOriLink = #{couponOriLink,jdbcType=VARCHAR},
        userTypeName = #{userTypeName,jdbcType=VARCHAR},
        createtime = #{createtime,jdbcType=TIMESTAMP},
        tkMktStatus = #{tkMktStatus,jdbcType=VARCHAR} ,
        updatetime = #{updatetime,jdbcType=TIMESTAMP},
        hasSame =
        #{hasSame,jdbcType=INTEGER},
        sameItemPid =
        #{sameItemPid,jdbcType=BIGINT},
        couponTotalCount =
        #{couponTotalCount,jdbcType=INTEGER},
        couponLeftCount =
        #{couponLeftCount,jdbcType=INTEGER},
        couponAmount =
        #{couponAmount,jdbcType=DECIMAL},
        eventRate =
        #{eventRate,jdbcType=VARCHAR},
        couponShortLink =
        #{couponShortLink,jdbcType=VARCHAR},
        couponInfo =
        #{couponInfo,jdbcType=VARCHAR},
        couponStartFee =
        #{couponStartFee,jdbcType=DECIMAL},
        couponEffectiveStartTime =
        #{couponEffectiveStartTime,jdbcType=VARCHAR},
        couponEffectiveEndTime =
        #{couponEffectiveEndTime,jdbcType=VARCHAR},
        hasUmpBonus =
        #{hasUmpBonus,jdbcType=VARCHAR},
        isBizActivity =
        #{isBizActivity,jdbcType=VARCHAR},
        umpBonus =
        #{umpBonus,jdbcType=VARCHAR},
        rootCategoryName =
        #{rootCategoryName,jdbcType=VARCHAR},
        ]couponOriLink =
        #{couponOriLink,jdbcType=VARCHAR},
        userTypeName =
        #{userTypeName,jdbcType=VARCHAR},
        createtime =
        #{createtime,jdbcType=TIMESTAMP},
        tkMktStatus =
        #{tkMktStatus,jdbcType=VARCHAR} ,
        updatetime =
        #{updatetime,jdbcType=TIMESTAMP},
        state =#{state,jdbcType=INTEGER},
        totalSales =#{totalSales,jdbcType=INTEGER}
        where id = #{id,jdbcType=BIGINT}
        totalSales =#{totalSales,jdbcType=INTEGER},
        material_lib_type =#{materialLibType,jdbcType=INTEGER}
        where id =
        #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief">
        update yeshi_ec_taobao_goods
@@ -358,6 +405,7 @@
            <if test="updatetime !=null">updatetime =#{updatetime,jdbcType=TIMESTAMP},</if>
            <if test="state !=null">state =#{state,jdbcType=INTEGER},</if>
            <if test="totalSales !=null">totalSales =#{totalSales,jdbcType=INTEGER},</if>
            <if test="materialLibType !=null">material_lib_type =#{materialLibType,jdbcType=INTEGER},</if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
@@ -426,7 +474,8 @@
            #{item.tkMktStatus,jdbcType=VARCHAR},
            #{item.updatetime,jdbcType=TIMESTAMP},
            #{item.state,jdbcType=INTEGER},
            #{item.totalSales,jdbcType=INTEGER}
            #{item.totalSales,jdbcType=INTEGER},
            #{item.materialLibType,jdbcType=INTEGER}
            )
        </foreach>
    </insert>
@@ -629,7 +678,7 @@
                    </if>
                </foreach>
            </trim>
			

            <trim prefix="totalSales =case" suffix="end,">
                <foreach collection="list" item="item" index="index">
                    <if test="item.totalSales !=null">
@@ -637,6 +686,15 @@
                    </if>
                </foreach>
            </trim>
			
			
            <trim prefix="materialLibType =case" suffix="end,">
                <foreach collection="list" item="item" index="index">
                    <if test="item.materialLibType !=null">
                        when id=#{item.id} then #{item.materialLibType}
                    </if>
                </foreach>
            </trim>

            <trim prefix="createtime =case" suffix="end,">
                <foreach collection="list" item="item" index="index">

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

@@ -82,6 +82,14 @@
        from yeshi_ec_taobao_order where to_trade_id = #{0}
    </select>
    
	
    <select id="listLongTimeNoUpdateOrders" resultMap="BaseResultMap">
        SELECT * FROM yeshi_ec_taobao_order t WHERE t.`to_order_state`='订单付款' AND UNIX_TIMESTAMP(t.`to_create_time`) <![CDATA[  <  ]]> UNIX_TIMESTAMP()-60*60*24*15 AND (t.`to_latest_updatetime` IS NULL OR UNIX_TIMESTAMP(t.`to_latest_updatetime`)<![CDATA[ < ]]>  UNIX_TIMESTAMP()-60*60*24*2) ORDER BY t.`to_create_time` DESC  limit #{start},#{count}
    </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/taobao/TaoBaoGoodsUpdateServiceImpl.java

@@ -182,6 +182,7 @@
        updateGoods.setRootCategoryName(goods.getRootCategoryName());

        updateGoods.setLeafCatId(goods.getLeafCatId());

        updateGoods.setLeafName(goods.getLeafName());

        updateGoods.setMaterialLibType(goods.getMaterialLibType());



        return updateGoods;

    }


 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -40,6 +40,7 @@
        cg.setVideoCover(null);

        cg.setVideoUrl(null);

        cg.setState(goods.getState());

        cg.setMaterialLibType(goods.getMaterialLibType());

        return cg;

    }




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

@@ -224,6 +224,8 @@


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

                goods.setMaterialLibType(item.optInt("material_lib_type"));

            else

                goods.setMaterialLibType(0);



            return goods;

        }