Merge remote-tracking branch 'origin/master'

admin

2019-04-04 3a6e476b2f498e876ff10f1328455f58e63ee85a

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

 .project

@@ -6,6 +6,11 @@
    </projects>

    <buildSpec>

        <buildCommand>

            <name>org.eclipse.wst.common.project.facet.core.builder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.jdt.core.javabuilder</name>

            <arguments>

            </arguments>

@@ -19,5 +24,6 @@
    <natures>

        <nature>org.eclipse.jdt.core.javanature</nature>

        <nature>org.eclipse.m2e.core.maven2Nature</nature>

        <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

    </natures>

</projectDescription>


 fanli/.classpath

@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

    <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resource">

        <attributes>

            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">

        <attributes>

            <attribute name="optional" value="true"/>

@@ -15,7 +10,6 @@
        <attributes>

            <attribute name="optional" value="true"/>

            <attribute name="maven.pomderived" value="true"/>

            <attribute name="test" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

@@ -24,20 +18,11 @@
            <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

    <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resource">

        <attributes>

            <attribute name="maven.pomderived" value="true"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="lib" path="libs/aes-jre1.6.jar"/>

    <classpathentry kind="lib" path="libs/alipay-sdk-java20170324180803.jar"/>

    <classpathentry kind="lib" path="libs/HMS_SDK_2.6.0.301_ADT.jar"/>

    <classpathentry kind="lib" path="libs/HMSAgent_2.6.0.302.jar"/>

    <classpathentry kind="lib" path="libs/javapns-jdk16-2.3.1.jar"/>

    <classpathentry kind="lib" path="libs/MiPush_SDK_Server_2_2_18.jar"/>

    <classpathentry kind="lib" path="libs/open-api-sdk-2.0.jar"/>

    <classpathentry kind="lib" path="libs/PushJavaSDK.jar"/>

    <classpathentry kind="lib" path="libs/taobao-sdk-java-auto_1533536267316-20180829.jar"/>

    <classpathentry kind="lib" path="libs/ueditor-1.1.2.jar"/>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_181"/>

    <classpathentry kind="output" path="target/classes"/>

</classpath>


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

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.dao.mybatis.taobao;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap;

public interface TaoBaoOrderTradeMapMapper extends BaseMapper<TaoBaoOrderTradeMap> {

    /**
     * 根据交易ID查询
     * 
     * @param tradeId
     * @return
     */
    TaoBaoOrderTradeMap selectByTradeId(String tradeId);

}

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

New file
@@ -0,0 +1,56 @@
package com.yeshi.fanli.entity.taobao;



import java.util.Date;



import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



/**

 * 淘宝订单交易ID映射

 * 
 * @author hexiaohui

 *

 */

@Table("yeshi_ec_taobao_order_trade_map")

public class TaoBaoOrderTradeMap {

    @Column(name = "totm_id")

    private Long id;

    @Column(name = "totm_order_id")

    private TaoBaoOrder taoBaoOrder;

    @Column(name = "totm_trade_id")

    private String tradeId;

    @Column(name = "totm_create_time")

    private Date createTime;



    public Long getId() {

        return id;

    }



    public void setId(Long id) {

        this.id = id;

    }



    public TaoBaoOrder getTaoBaoOrder() {

        return taoBaoOrder;

    }



    public void setTaoBaoOrder(TaoBaoOrder taoBaoOrder) {

        this.taoBaoOrder = taoBaoOrder;

    }



    public String getTradeId() {

        return tradeId;

    }



    public void setTradeId(String tradeId) {

        this.tradeId = tradeId;

    }



    public Date getCreateTime() {

        return createTime;

    }



    public void setCreateTime(Date createTime) {

        this.createTime = createTime;

    }

}


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

@@ -688,7 +688,7 @@
            </trim>
            
            
            <trim prefix="materialLibType =case" suffix="end,">
            <trim prefix="material_lib_type =case" suffix="end,">
                <foreach collection="list" item="item" index="index">
                    <if test="item.materialLibType !=null">
                        when id=#{item.id} then #{item.materialLibType}

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

New file
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderTradeMapMapper">
    <resultMap id="BaseResultMap"
        type="com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap">
        <id column="totm_id" property="id" jdbcType="BIGINT" />
        <result column="totm_trade_id" property="tradeId" jdbcType="VARCHAR" />
        <result column="totm_create_time" property="createTime"
            jdbcType="TIMESTAMP" />
        <association property="taoBaoOrder"
            javaType="com.yeshi.fanli.entity.taobao.TaoBaoOrder">
            <id property="id" column="totm_order_id" />
        </association>
    </resultMap>
    <sql id="Base_Column_List">totm_id,totm_order_id,totm_trade_id,totm_create_time</sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_taobao_order_trade_map where totm_id =
        #{id,jdbcType=BIGINT}
    </select>

    <select id="selectByTradeId" resultMap="BaseResultMap"
        parameterType="java.lang.String">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_taobao_order_trade_map where totm_trade_id =
        #{0}
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_taobao_order_trade_map where totm_id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap"
        useGeneratedKeys="true" keyProperty="id">insert into
        yeshi_ec_taobao_order_trade_map
        (totm_id,totm_order_id,totm_trade_id,totm_create_time) values
        (#{id,jdbcType=BIGINT},#{taoBaoOrder.id,jdbcType=BIGINT},#{tradeId,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_taobao_order_trade_map
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">totm_id,</if>
            <if test="taoBaoOrder != null">totm_order_id,</if>
            <if test="tradeId != null">totm_trade_id,</if>
            <if test="createTime != null">totm_create_time,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="taoBaoOrder != null">#{taoBaoOrder.id,jdbcType=BIGINT},</if>
            <if test="tradeId != null">#{tradeId,jdbcType=VARCHAR},</if>
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap">update
        yeshi_ec_taobao_order_trade_map set totm_order_id =
        #{taoBaoOrder.id,jdbcType=BIGINT},totm_trade_id =
        #{tradeId,jdbcType=VARCHAR},totm_create_time =
        #{createTime,jdbcType=TIMESTAMP} where totm_id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap">
        update yeshi_ec_taobao_order_trade_map
        <set>
            <if test="taoBaoOrder != null">totm_order_id=#{taoBaoOrder.id,jdbcType=BIGINT},</if>
            <if test="tradeId != null">totm_trade_id=#{tradeId,jdbcType=VARCHAR},</if>
            <if test="createTime != null">totm_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
        </set>
        where totm_id = #{id,jdbcType=BIGINT}
    </update>
</mapper>

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

@@ -11,7 +11,9 @@
import org.springframework.transaction.annotation.Transactional;



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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -26,6 +28,9 @@


    @Resource

    private RedisManager redisManager;



    @Resource

    private TaoBaoOrderTradeMapMapper taoBaoOrderTradeMapMapper;



    @Override

    public void addTaoBaoOrderList(List<TaoBaoOrder> list) {

@@ -47,7 +52,7 @@
            } catch (Exception e) {



            }

			


            addTaoBaoOrder(orderId, map.get(orderId));

            try {

                // 6小时内不再处理

@@ -56,8 +61,20 @@
            } catch (Exception e) {



            }



        }

    }



    @Transactional

    private void addTaoBaoOrderTradeMap(TaoBaoOrder order) {

        if (order == null || StringUtil.isNullOrEmpty(order.getTradeId()))

            return;

        TaoBaoOrderTradeMap map = new TaoBaoOrderTradeMap();

        map.setCreateTime(new Date());

        map.setTaoBaoOrder(order);

        map.setTradeId(order.getTradeId());

        TaoBaoOrderTradeMap oldMap = taoBaoOrderTradeMapMapper.selectByTradeId(order.getTradeId());

        if (oldMap == null)

            taoBaoOrderTradeMapMapper.insertSelective(map);

    }



    @Transactional

@@ -68,6 +85,7 @@
            for (TaoBaoOrder taoBaoOrder : list) {

                taoBaoOrder.setLatestUpdateTime(new Date());

                taoBaoOrderMapper.insertSelective(taoBaoOrder);

                addTaoBaoOrderTradeMap(taoBaoOrder);

            }

        } else {

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

@@ -75,6 +93,7 @@
                for (TaoBaoOrder taoBaoOrder : list) {

                    taoBaoOrder.setLatestUpdateTime(new Date());

                    taoBaoOrderMapper.insertSelective(taoBaoOrder);

                    addTaoBaoOrderTradeMap(taoBaoOrder);

                }

            } else {

                // 按tradeId更新

@@ -83,12 +102,14 @@
                    if (order == null) {

                        taoBaoOrder.setLatestUpdateTime(new Date());

                        taoBaoOrderMapper.insertSelective(taoBaoOrder);

                        addTaoBaoOrderTradeMap(taoBaoOrder);

                    } else {

                        taoBaoOrder.setId(order.getId());

                        taoBaoOrder.setRelationId(order.getRelationId());

                        taoBaoOrder.setSpecialId(order.getSpecialId());

                        taoBaoOrder.setLatestUpdateTime(new Date());

                        taoBaoOrderMapper.updateByPrimaryKeySelective(taoBaoOrder);

                        addTaoBaoOrderTradeMap(taoBaoOrder);

                    }

                }

            }


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

@@ -13,9 +13,9 @@
public class Constant {

    public static boolean IS_TASK = false;

    // 外网环境

    public static boolean IS_OUTNET = false;

    public static boolean IS_OUTNET = true;



    public static boolean IS_TEST = true;

    public static boolean IS_TEST = false;



    public static int PAGE_SIZE = 20;

    public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 微信任务类型编号


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

@@ -99,9 +99,10 @@
            doWeiQuanOrder();// 处理维权订单

            doPushIOS();// 处理发送IOS消息

            doThreeSaleUserCouponJob();// 处理邀请队列

            doUpdateGoodsJob();

        } else if (!Constant.IS_TEST) {

            initScheduler();// 启动定时任务

            // doUpdateGoodsJob();

            // 
        }

    }




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

@@ -1309,11 +1309,11 @@
     *            用户再次分成比例（0-100）

     * @return

     */

    public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

    public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
        if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)

            return "¥0.00";

        else

            return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();

        else
            return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
    }



    /**


 fanli/src/main/resource/druid.properties

@@ -18,15 +18,15 @@




#外网正式

#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

#druid.username=root

#druid.password=Yeshi2016@



#外网本地测试

druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan

druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

druid.username=root

druid.password=Yeshi2016@



#外网本地测试

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan

#druid.username=root

#druid.password=Yeshi2016@



druid.initialSize=10

druid.minIdle=6

druid.maxActive=100


 fanli/src/test/java/org/fanli/MyBatisProduce.java

@@ -7,6 +7,7 @@
import com.yeshi.fanli.entity.bus.invite.SpreadUserImg;

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

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

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



//@Ignore

public class MyBatisProduce {

@@ -14,7 +15,7 @@
    @Test

    public void test3() {


        MyBatisMapperUtil.createMapper(LostOrder.class);

        MyBatisMapperUtil.createMapper(TaoBaoOrderTradeMap.class);

        // MyBatisMapperUtil.createMapper(TaoBaoUnionAuthRecord.class);

    }




 pom.xml

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.yeshi</groupId>
    <artifactId>FanLiMain</artifactId>
@@ -533,5 +532,7 @@
    <modules>
        <module>utils</module>
        <module>fanli</module>
    </modules>
    <module>test1</module>
    <module>test12</module>
  </modules>
</project>

 utils/.classpath

@@ -18,10 +18,6 @@
            <attribute name="org.eclipse.jst.component.nondependency" value=""/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

        <attributes>

            <attribute name="owner.project.facets" value="java"/>

        </attributes>

    </classpathentry>

    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_181"/>

    <classpathentry kind="output" path="target/classes"/>

</classpath>


 utils/.project

@@ -16,12 +16,12 @@
            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.m2e.core.maven2Builder</name>

            <name>org.eclipse.wst.validation.validationbuilder</name>

            <arguments>

            </arguments>

        </buildCommand>

        <buildCommand>

            <name>org.eclipse.wst.validation.validationbuilder</name>

            <name>org.eclipse.m2e.core.maven2Builder</name>

            <arguments>

            </arguments>

        </buildCommand>