Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 a8386e2acf689c8f5b77e290bcd027196e3e83fb

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderRepairHistoryMapper.java
	fanli/src/main/java/com/yeshi/fanli/mapping/order/OrderRepairHistoryMapper.xml

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

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

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.order.OrderRepairHistory;


public interface OrderRepairHistoryMapper extends BaseMapper<OrderRepairHistory> {

}

 fanli/src/main/java/com/yeshi/fanli/mapping/order/OrderRepairHistoryMapper.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.order.OrderRepairHistoryMapper">
    <resultMap id="BaseResultMap"
        type="com.yeshi.fanli.entity.order.OrderRepairHistory">
        <id column="id" property="id" jdbcType="BIGINT" />
        <result column="before_get_money" property="beforeGetMoney"
            jdbcType="DECIMAL" />
        <result column="after_get_money" property="afterGetMoney"
            jdbcType="DECIMAL" />
        <result column="uid" property="uid" jdbcType="BIGINT" />
        <result column="order_id" property="orderId" jdbcType="VARCHAR" />
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
    </resultMap>
    <sql id="Base_Column_List">id,before_get_money,after_get_money,uid,order_id,create_time
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_order_repair_history where id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_order_repair_history where id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.order.OrderRepairHistory"
        useGeneratedKeys="true" keyProperty="id">insert into
        yeshi_ec_order_repair_history
        (id,before_get_money,after_get_money,uid,order_id,create_time) values
        (#{id,jdbcType=BIGINT},#{beforeGetMoney,jdbcType=DECIMAL},#{afterGetMoney,jdbcType=DECIMAL},#{uid,jdbcType=BIGINT},#{orderId,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.OrderRepairHistory"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_order_repair_history
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="beforeGetMoney != null">before_get_money,</if>
            <if test="afterGetMoney != null">after_get_money,</if>
            <if test="uid != null">uid,</if>
            <if test="orderId != null">order_id,</if>
            <if test="createTime != null">create_time,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="beforeGetMoney != null">#{beforeGetMoney,jdbcType=DECIMAL},</if>
            <if test="afterGetMoney != null">#{afterGetMoney,jdbcType=DECIMAL},</if>
            <if test="uid != null">#{uid,jdbcType=BIGINT},</if>
            <if test="orderId != null">#{orderId,jdbcType=VARCHAR},</if>
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.OrderRepairHistory">update
        yeshi_ec_order_repair_history set before_get_money =
        #{beforeGetMoney,jdbcType=DECIMAL},after_get_money =
        #{afterGetMoney,jdbcType=DECIMAL},uid =
        #{uid,jdbcType=BIGINT},order_id =
        #{orderId,jdbcType=VARCHAR},create_time =
        #{createTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.OrderRepairHistory">
        update yeshi_ec_order_repair_history
        <set>
            <if test="beforeGetMoney != null">before_get_money=#{beforeGetMoney,jdbcType=DECIMAL},</if>
            <if test="afterGetMoney != null">after_get_money=#{afterGetMoney,jdbcType=DECIMAL},</if>
            <if test="uid != null">uid=#{uid,jdbcType=BIGINT},</if>
            <if test="orderId != null">order_id=#{orderId,jdbcType=VARCHAR},</if>
            <if test="createTime != null">create_time=#{createTime,jdbcType=TIMESTAMP},</if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
</mapper>