From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml |  284 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 146 insertions(+), 138 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml
index 3bf497a..2789016 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml
@@ -1,138 +1,146 @@
-<?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.elme.ElmeOrderMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.elme.ElmeOrder">
-		<id column="eo_id" property="id" jdbcType="BIGINT" />
-		<result column="eo_channel_id" property="channelId" jdbcType="VARCHAR" />
-		<result column="eo_channel_name" property="channelName"
-			jdbcType="VARCHAR" />
-		<result column="eo_track_pid" property="trackPid" jdbcType="VARCHAR" />
-		<result column="eo_rid" property="rid" jdbcType="VARCHAR" />
-		<result column="eo_order_date" property="orderDate" jdbcType="TIMESTAMP" />
-		<result column="eo_order_id" property="orderId" jdbcType="VARCHAR" />
-		<result column="eo_pay_money" property="payMoney" jdbcType="DECIMAL" />
-		<result column="eo_city" property="city" jdbcType="VARCHAR" />
-		<result column="eo_coupon_money" property="couponMoney"
-			jdbcType="DECIMAL" />
-		<result column="eo_newer_first_order" property="newerFirstOrder"
-			jdbcType="INTEGER" />
-		<result column="eo_newer_repay_order" property="newerRepayOrder"
-			jdbcType="INTEGER" />
-		<result column="eo_taoke_hongbao" property="taokeHongBao"
-			jdbcType="INTEGER" />
-		<result column="eo_shop_click" property="shopClick" jdbcType="INTEGER" />
-		<result column="eo_recieve_coupon_7day_first_order" property="recieveCoupon7DayFirstOrder"
-			jdbcType="INTEGER" />
-		<result column="eo_settle" property="isSettle" jdbcType="BOOLEAN" />
-		<result column="eo_create_time" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="eo_update_time" property="updateTime" jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">eo_id,eo_channel_id,eo_channel_name,eo_track_pid,eo_rid,eo_order_date,eo_order_id,eo_pay_money,eo_city,eo_coupon_money,eo_newer_first_order,eo_newer_repay_order,eo_taoke_hongbao,eo_shop_click,eo_recieve_coupon_7day_first_order,eo_settle,eo_create_time,eo_update_time
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_elme_order where eo_id = #{id,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_elme_order where eo_id = #{id,jdbcType=BIGINT}</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_elme_order
-		(eo_id,eo_channel_id,eo_channel_name,eo_track_pid,eo_rid,eo_order_date,eo_order_id,eo_pay_money,eo_city,eo_coupon_money,eo_newer_first_order,eo_newer_repay_order,eo_taoke_hongbao,eo_shop_click,eo_recieve_coupon_7day_first_order,eo_settle,eo_create_time,eo_update_time)
-		values
-		(#{id,jdbcType=BIGINT},#{channelId,jdbcType=VARCHAR},#{channelName,jdbcType=VARCHAR},#{trackPid,jdbcType=VARCHAR},#{rid,jdbcType=VARCHAR},#{orderDate,jdbcType=TIMESTAMP},#{orderId,jdbcType=VARCHAR},#{payMoney,jdbcType=DECIMAL},#{city,jdbcType=VARCHAR},#{couponMoney,jdbcType=DECIMAL},#{newerFirstOrder,jdbcType=INTEGER},#{newerRepayOrder,jdbcType=INTEGER},#{taokeHongBao,jdbcType=INTEGER},#{shopClick,jdbcType=INTEGER},#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},#{isSettle,jdbcType=BOOLEAN},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_elme_order
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">eo_id,</if>
-			<if test="channelId != null">eo_channel_id,</if>
-			<if test="channelName != null">eo_channel_name,</if>
-			<if test="trackPid != null">eo_track_pid,</if>
-			<if test="rid != null">eo_rid,</if>
-			<if test="orderDate != null">eo_order_date,</if>
-			<if test="orderId != null">eo_order_id,</if>
-			<if test="payMoney != null">eo_pay_money,</if>
-			<if test="city != null">eo_city,</if>
-			<if test="couponMoney != null">eo_coupon_money,</if>
-			<if test="newerFirstOrder != null">eo_newer_first_order,</if>
-			<if test="newerRepayOrder != null">eo_newer_repay_order,</if>
-			<if test="taokeHongBao != null">eo_taoke_hongbao,</if>
-			<if test="shopClick != null">eo_shop_click,</if>
-			<if test="recieveCoupon7DayFirstOrder != null">eo_recieve_coupon_7day_first_order,</if>
-			<if test="isSettle != null">eo_settle,</if>
-			<if test="createTime != null">eo_create_time,</if>
-			<if test="updateTime != null">eo_update_time,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="channelId != null">#{channelId,jdbcType=VARCHAR},</if>
-			<if test="channelName != null">#{channelName,jdbcType=VARCHAR},</if>
-			<if test="trackPid != null">#{trackPid,jdbcType=VARCHAR},</if>
-			<if test="rid != null">#{rid,jdbcType=VARCHAR},</if>
-			<if test="orderDate != null">#{orderDate,jdbcType=TIMESTAMP},</if>
-			<if test="orderId != null">#{orderId,jdbcType=VARCHAR},</if>
-			<if test="payMoney != null">#{payMoney,jdbcType=DECIMAL},</if>
-			<if test="city != null">#{city,jdbcType=VARCHAR},</if>
-			<if test="couponMoney != null">#{couponMoney,jdbcType=DECIMAL},</if>
-			<if test="newerFirstOrder != null">#{newerFirstOrder,jdbcType=INTEGER},</if>
-			<if test="newerRepayOrder != null">#{newerRepayOrder,jdbcType=INTEGER},</if>
-			<if test="taokeHongBao != null">#{taokeHongBao,jdbcType=INTEGER},</if>
-			<if test="shopClick != null">#{shopClick,jdbcType=INTEGER},</if>
-			<if test="recieveCoupon7DayFirstOrder != null">#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},</if>
-			<if test="isSettle != null">#{isSettle,jdbcType=BOOLEAN},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder">update
-		yeshi_ec_elme_order set eo_channel_id =
-		#{channelId,jdbcType=VARCHAR},eo_channel_name =
-		#{channelName,jdbcType=VARCHAR},eo_track_pid =
-		#{trackPid,jdbcType=VARCHAR},eo_rid =
-		#{rid,jdbcType=VARCHAR},eo_order_date =
-		#{orderDate,jdbcType=TIMESTAMP},eo_order_id =
-		#{orderId,jdbcType=VARCHAR},eo_pay_money =
-		#{payMoney,jdbcType=DECIMAL},eo_city =
-		#{city,jdbcType=VARCHAR},eo_coupon_money =
-		#{couponMoney,jdbcType=DECIMAL},eo_newer_first_order =
-		#{newerFirstOrder,jdbcType=INTEGER},eo_newer_repay_order =
-		#{newerRepayOrder,jdbcType=INTEGER},eo_taoke_hongbao =
-		#{taokeHongBao,jdbcType=INTEGER},eo_shop_click =
-		#{shopClick,jdbcType=INTEGER},eo_recieve_coupon_7day_first_order =
-		#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},eo_settle =
-		#{isSettle,jdbcType=BOOLEAN},eo_create_time =
-		#{createTime,jdbcType=TIMESTAMP},eo_update_time =
-		#{updateTime,jdbcType=TIMESTAMP} where eo_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder">
-		update yeshi_ec_elme_order
-		<set>
-			<if test="channelId != null">eo_channel_id=#{channelId,jdbcType=VARCHAR},</if>
-			<if test="channelName != null">eo_channel_name=#{channelName,jdbcType=VARCHAR},</if>
-			<if test="trackPid != null">eo_track_pid=#{trackPid,jdbcType=VARCHAR},</if>
-			<if test="rid != null">eo_rid=#{rid,jdbcType=VARCHAR},</if>
-			<if test="orderDate != null">eo_order_date=#{orderDate,jdbcType=TIMESTAMP},</if>
-			<if test="orderId != null">eo_order_id=#{orderId,jdbcType=VARCHAR},</if>
-			<if test="payMoney != null">eo_pay_money=#{payMoney,jdbcType=DECIMAL},</if>
-			<if test="city != null">eo_city=#{city,jdbcType=VARCHAR},</if>
-			<if test="couponMoney != null">eo_coupon_money=#{couponMoney,jdbcType=DECIMAL},</if>
-			<if test="newerFirstOrder != null">eo_newer_first_order=#{newerFirstOrder,jdbcType=INTEGER},
-			</if>
-			<if test="newerRepayOrder != null">eo_newer_repay_order=#{newerRepayOrder,jdbcType=INTEGER},
-			</if>
-			<if test="taokeHongBao != null">eo_taoke_hongbao=#{taokeHongBao,jdbcType=INTEGER},</if>
-			<if test="shopClick != null">eo_shop_click=#{shopClick,jdbcType=INTEGER},</if>
-			<if test="recieveCoupon7DayFirstOrder != null">eo_recieve_coupon_7day_first_order=#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},
-			</if>
-			<if test="isSettle != null">eo_settle=#{isSettle,jdbcType=BOOLEAN},</if>
-			<if test="createTime != null">eo_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">eo_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where eo_id = #{id,jdbcType=BIGINT}
-	</update>
-</mapper>
+<?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.elme.ElmeOrderMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.elme.ElmeOrder">
+		<id column="eo_id" property="id" jdbcType="BIGINT" />
+		<result column="eo_channel_id" property="channelId" jdbcType="VARCHAR" />
+		<result column="eo_channel_name" property="channelName"
+			jdbcType="VARCHAR" />
+		<result column="eo_track_pid" property="trackPid" jdbcType="VARCHAR" />
+		<result column="eo_rid" property="rid" jdbcType="VARCHAR" />
+		<result column="eo_order_date" property="orderDate" jdbcType="TIMESTAMP" />
+		<result column="eo_order_id" property="orderId" jdbcType="VARCHAR" />
+		<result column="eo_pay_money" property="payMoney" jdbcType="DECIMAL" />
+		<result column="eo_city" property="city" jdbcType="VARCHAR" />
+		<result column="eo_coupon_money" property="couponMoney"
+			jdbcType="DECIMAL" />
+		<result column="eo_newer_first_order" property="newerFirstOrder"
+			jdbcType="INTEGER" />
+		<result column="eo_newer_repay_order" property="newerRepayOrder"
+			jdbcType="INTEGER" />
+		<result column="eo_taoke_hongbao" property="taokeHongBao"
+			jdbcType="INTEGER" />
+		<result column="eo_shop_click" property="shopClick" jdbcType="INTEGER" />
+		<result column="eo_recieve_coupon_7day_first_order" property="recieveCoupon7DayFirstOrder"
+			jdbcType="INTEGER" />
+		<result column="eo_settle" property="isSettle" jdbcType="BOOLEAN" />
+		<result column="eo_create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="eo_update_time" property="updateTime" jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">eo_id,eo_channel_id,eo_channel_name,eo_track_pid,eo_rid,eo_order_date,eo_order_id,eo_pay_money,eo_city,eo_coupon_money,eo_newer_first_order,eo_newer_repay_order,eo_taoke_hongbao,eo_shop_click,eo_recieve_coupon_7day_first_order,eo_settle,eo_create_time,eo_update_time
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_elme_order where eo_id = #{id,jdbcType=BIGINT}
+	</select>
+	
+	<select id="selectByOrderId" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_elme_order where eo_order_id = #{0}
+	</select>
+	
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_elme_order where eo_id = #{id,jdbcType=BIGINT}</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_elme_order
+		(eo_id,eo_channel_id,eo_channel_name,eo_track_pid,eo_rid,eo_order_date,eo_order_id,eo_pay_money,eo_city,eo_coupon_money,eo_newer_first_order,eo_newer_repay_order,eo_taoke_hongbao,eo_shop_click,eo_recieve_coupon_7day_first_order,eo_settle,eo_create_time,eo_update_time)
+		values
+		(#{id,jdbcType=BIGINT},#{channelId,jdbcType=VARCHAR},#{channelName,jdbcType=VARCHAR},#{trackPid,jdbcType=VARCHAR},#{rid,jdbcType=VARCHAR},#{orderDate,jdbcType=TIMESTAMP},#{orderId,jdbcType=VARCHAR},#{payMoney,jdbcType=DECIMAL},#{city,jdbcType=VARCHAR},#{couponMoney,jdbcType=DECIMAL},#{newerFirstOrder,jdbcType=INTEGER},#{newerRepayOrder,jdbcType=INTEGER},#{taokeHongBao,jdbcType=INTEGER},#{shopClick,jdbcType=INTEGER},#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},#{isSettle,jdbcType=BOOLEAN},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_elme_order
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">eo_id,</if>
+			<if test="channelId != null">eo_channel_id,</if>
+			<if test="channelName != null">eo_channel_name,</if>
+			<if test="trackPid != null">eo_track_pid,</if>
+			<if test="rid != null">eo_rid,</if>
+			<if test="orderDate != null">eo_order_date,</if>
+			<if test="orderId != null">eo_order_id,</if>
+			<if test="payMoney != null">eo_pay_money,</if>
+			<if test="city != null">eo_city,</if>
+			<if test="couponMoney != null">eo_coupon_money,</if>
+			<if test="newerFirstOrder != null">eo_newer_first_order,</if>
+			<if test="newerRepayOrder != null">eo_newer_repay_order,</if>
+			<if test="taokeHongBao != null">eo_taoke_hongbao,</if>
+			<if test="shopClick != null">eo_shop_click,</if>
+			<if test="recieveCoupon7DayFirstOrder != null">eo_recieve_coupon_7day_first_order,</if>
+			<if test="isSettle != null">eo_settle,</if>
+			<if test="createTime != null">eo_create_time,</if>
+			<if test="updateTime != null">eo_update_time,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="channelId != null">#{channelId,jdbcType=VARCHAR},</if>
+			<if test="channelName != null">#{channelName,jdbcType=VARCHAR},</if>
+			<if test="trackPid != null">#{trackPid,jdbcType=VARCHAR},</if>
+			<if test="rid != null">#{rid,jdbcType=VARCHAR},</if>
+			<if test="orderDate != null">#{orderDate,jdbcType=TIMESTAMP},</if>
+			<if test="orderId != null">#{orderId,jdbcType=VARCHAR},</if>
+			<if test="payMoney != null">#{payMoney,jdbcType=DECIMAL},</if>
+			<if test="city != null">#{city,jdbcType=VARCHAR},</if>
+			<if test="couponMoney != null">#{couponMoney,jdbcType=DECIMAL},</if>
+			<if test="newerFirstOrder != null">#{newerFirstOrder,jdbcType=INTEGER},</if>
+			<if test="newerRepayOrder != null">#{newerRepayOrder,jdbcType=INTEGER},</if>
+			<if test="taokeHongBao != null">#{taokeHongBao,jdbcType=INTEGER},</if>
+			<if test="shopClick != null">#{shopClick,jdbcType=INTEGER},</if>
+			<if test="recieveCoupon7DayFirstOrder != null">#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},</if>
+			<if test="isSettle != null">#{isSettle,jdbcType=BOOLEAN},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder">update
+		yeshi_ec_elme_order set eo_channel_id =
+		#{channelId,jdbcType=VARCHAR},eo_channel_name =
+		#{channelName,jdbcType=VARCHAR},eo_track_pid =
+		#{trackPid,jdbcType=VARCHAR},eo_rid =
+		#{rid,jdbcType=VARCHAR},eo_order_date =
+		#{orderDate,jdbcType=TIMESTAMP},eo_order_id =
+		#{orderId,jdbcType=VARCHAR},eo_pay_money =
+		#{payMoney,jdbcType=DECIMAL},eo_city =
+		#{city,jdbcType=VARCHAR},eo_coupon_money =
+		#{couponMoney,jdbcType=DECIMAL},eo_newer_first_order =
+		#{newerFirstOrder,jdbcType=INTEGER},eo_newer_repay_order =
+		#{newerRepayOrder,jdbcType=INTEGER},eo_taoke_hongbao =
+		#{taokeHongBao,jdbcType=INTEGER},eo_shop_click =
+		#{shopClick,jdbcType=INTEGER},eo_recieve_coupon_7day_first_order =
+		#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},eo_settle =
+		#{isSettle,jdbcType=BOOLEAN},eo_create_time =
+		#{createTime,jdbcType=TIMESTAMP},eo_update_time =
+		#{updateTime,jdbcType=TIMESTAMP} where eo_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder">
+		update yeshi_ec_elme_order
+		<set>
+			<if test="channelId != null">eo_channel_id=#{channelId,jdbcType=VARCHAR},</if>
+			<if test="channelName != null">eo_channel_name=#{channelName,jdbcType=VARCHAR},</if>
+			<if test="trackPid != null">eo_track_pid=#{trackPid,jdbcType=VARCHAR},</if>
+			<if test="rid != null">eo_rid=#{rid,jdbcType=VARCHAR},</if>
+			<if test="orderDate != null">eo_order_date=#{orderDate,jdbcType=TIMESTAMP},</if>
+			<if test="orderId != null">eo_order_id=#{orderId,jdbcType=VARCHAR},</if>
+			<if test="payMoney != null">eo_pay_money=#{payMoney,jdbcType=DECIMAL},</if>
+			<if test="city != null">eo_city=#{city,jdbcType=VARCHAR},</if>
+			<if test="couponMoney != null">eo_coupon_money=#{couponMoney,jdbcType=DECIMAL},</if>
+			<if test="newerFirstOrder != null">eo_newer_first_order=#{newerFirstOrder,jdbcType=INTEGER},
+			</if>
+			<if test="newerRepayOrder != null">eo_newer_repay_order=#{newerRepayOrder,jdbcType=INTEGER},
+			</if>
+			<if test="taokeHongBao != null">eo_taoke_hongbao=#{taokeHongBao,jdbcType=INTEGER},</if>
+			<if test="shopClick != null">eo_shop_click=#{shopClick,jdbcType=INTEGER},</if>
+			<if test="recieveCoupon7DayFirstOrder != null">eo_recieve_coupon_7day_first_order=#{recieveCoupon7DayFirstOrder,jdbcType=INTEGER},
+			</if>
+			<if test="isSettle != null">eo_settle=#{isSettle,jdbcType=BOOLEAN},</if>
+			<if test="createTime != null">eo_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">eo_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where eo_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0