From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +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/msg/MsgOrderDetailMapper.xml |  282 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml
index 617a967..4d3da72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml
@@ -1,141 +1,141 @@
-<?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.msg.MsgOrderDetailMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">
-		<id column="mo_id" property="id" jdbcType="BIGINT" />
-		<result column="mo_type" property="type"
-			typeHandler="com.yeshi.fanli.util.mybatishandler.msg.MsgTypeOrderTypeEnumHandler" />
-		<result column="mo_order_id" property="orderId" jdbcType="VARCHAR" />
-		<result column="mo_state" property="state" jdbcType="INTEGER" />
-		<result column="mo_goods_count" property="goodsCount" jdbcType="INTEGER" />
-		<result column="mo_pay_money" property="payMoney" jdbcType="DECIMAL" />
-		<result column="mo_hongbao_money" property="hongBaoMoney"
-			jdbcType="DECIMAL" />
-		<result column="mo_beizhu" property="beiZhu" jdbcType="VARCHAR" />
-		<result column="mo_read" property="read" jdbcType="BOOLEAN" />
-		<result column="mo_create_time" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="mo_update_time" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="mo_happen_date" property="happendDate"
-			jdbcType="TIMESTAMP" />
-		<result column="mo_order_type" property="orderType" jdbcType="INTEGER" />
-		<association property="user" column="mo_uid"
-			javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
-			<id column="mo_uid" property="id" jdbcType="BIGINT" />
-		</association>
-
-	</resultMap>
-	<sql id="Base_Column_List">mo_id,mo_uid,mo_type,mo_order_id,mo_state,mo_goods_count,mo_pay_money,mo_hongbao_money,mo_beizhu,mo_read,mo_create_time,mo_update_time,mo_happen_date,mo_order_type
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_msg_order where mo_id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="selectByUidAndOrderId" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_msg_order where mo_uid = #{uid,jdbcType=BIGINT} and
-		mo_order_id=#{orderId}  order by mo_id desc limit 1
-	</select>
-	<select id="listByOrderId" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_msg_order where mo_order_id = #{orderId}
-	</select>
-	<select id="listByUid" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_msg_order where mo_uid = #{uid,jdbcType=BIGINT} order by
-		mo_update_time desc limit #{start},#{count}
-	</select>
-	<select id="countByUid" resultType="java.lang.Long"
-		parameterType="java.lang.Long">select count(mo_id) from yeshi_ec_msg_order where mo_uid
-		= #{uid,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_msg_order where mo_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_msg_order
-		(mo_id,mo_uid,mo_type,mo_order_id,mo_state,mo_goods_count,mo_pay_money,mo_hongbao_money,mo_beizhu,mo_read,mo_create_time,mo_update_time,mo_happen_date,mo_order_type)
-		values
-		(#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{orderId,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{goodsCount,jdbcType=INTEGER},#{payMoney,jdbcType=DECIMAL},#{hongBaoMoney,jdbcType=DECIMAL},#{beiZhu,jdbcType=VARCHAR},#{read,jdbcType=BOOLEAN},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{happendDate,jdbcType=TIMESTAMP},#{orderType,jdbcType=INTEGER})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_msg_order
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">mo_id,</if>
-			<if test="user != null">mo_uid,</if>
-			<if test="type != null">mo_type,</if>
-			<if test="orderId != null">mo_order_id,</if>
-			<if test="state != null">mo_state,</if>
-			<if test="goodsCount != null">mo_goods_count,</if>
-			<if test="payMoney != null">mo_pay_money,</if>
-			<if test="hongBaoMoney != null">mo_hongbao_money,</if>
-			<if test="beiZhu != null">mo_beizhu,</if>
-			<if test="read != null">mo_read,</if>
-			<if test="createTime != null">mo_create_time,</if>
-			<if test="updateTime != null">mo_update_time,</if>
-			<if test="happendDate != null">mo_happen_date,</if>
-			<if test="orderType != null">mo_order_type,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="user != null">#{user.id,jdbcType=BIGINT},</if>
-			<if test="type != null">#{type,jdbcType=VARCHAR},</if>
-			<if test="orderId != null">#{orderId,jdbcType=VARCHAR},</if>
-			<if test="state != null">#{state,jdbcType=INTEGER},</if>
-			<if test="goodsCount != null">#{goodsCount,jdbcType=INTEGER},</if>
-			<if test="payMoney != null">#{payMoney,jdbcType=DECIMAL},</if>
-			<if test="hongBaoMoney != null">#{hongBaoMoney,jdbcType=DECIMAL},</if>
-			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
-			<if test="read != null">#{read,jdbcType=BOOLEAN},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="happendDate != null">#{happendDate,jdbcType=TIMESTAMP},</if>
-			<if test="orderType != null">#{orderType,jdbcType=INTEGER}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">update
-		yeshi_ec_msg_order set mo_uid = #{user.id,jdbcType=BIGINT},mo_type =
-		#{type,jdbcType=VARCHAR},mo_order_id =
-		#{orderId,jdbcType=VARCHAR},mo_state =
-		#{state,jdbcType=INTEGER},mo_goods_count =
-		#{goodsCount,jdbcType=INTEGER},mo_pay_money =
-		#{payMoney,jdbcType=DECIMAL},mo_hongbao_money =
-		#{hongBaoMoney,jdbcType=DECIMAL},mo_beizhu =
-		#{beiZhu,jdbcType=VARCHAR},mo_read =
-		#{read,jdbcType=BOOLEAN},mo_create_time =
-		#{createTime,jdbcType=TIMESTAMP},mo_update_time =
-		#{updateTime,jdbcType=TIMESTAMP},mo_happen_date=#{happendDate,jdbcType=TIMESTAMP}
-		,mo_order_type =#{orderType,jdbcType=INTEGER} where mo_id =
-		#{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">
-		update yeshi_ec_msg_order
-		<set>
-			<if test="user != null">mo_uid=#{user.id,jdbcType=BIGINT},</if>
-			<if test="type != null">mo_type=#{type,jdbcType=VARCHAR},</if>
-			<if test="orderId != null">mo_order_id=#{orderId,jdbcType=VARCHAR},</if>
-			<if test="state != null">mo_state=#{state,jdbcType=INTEGER},</if>
-			<if test="goodsCount != null">mo_goods_count=#{goodsCount,jdbcType=INTEGER},</if>
-			<if test="payMoney != null">mo_pay_money=#{payMoney,jdbcType=DECIMAL},</if>
-			<if test="hongBaoMoney != null">mo_hongbao_money=#{hongBaoMoney,jdbcType=DECIMAL},</if>
-			<if test="beiZhu != null">mo_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
-			<if test="read != null">mo_read=#{read,jdbcType=BOOLEAN},</if>
-			<if test="createTime != null">mo_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">mo_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="happendDate != null">mo_happen_date=#{happendDate,jdbcType=TIMESTAMP},</if>
-			<if test="orderType !=null">mo_order_type =#{orderType,jdbcType=INTEGER},</if>
-		</set>
-		where mo_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="setMsgReadByUid" parameterType="java.lang.Long">update
-		yeshi_ec_msg_order set mo_read=1 where mo_uid=#{0}
-	</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.msg.MsgOrderDetailMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">
+		<id column="mo_id" property="id" jdbcType="BIGINT" />
+		<result column="mo_type" property="type"
+			typeHandler="com.yeshi.fanli.util.mybatishandler.msg.MsgTypeOrderTypeEnumHandler" />
+		<result column="mo_order_id" property="orderId" jdbcType="VARCHAR" />
+		<result column="mo_state" property="state" jdbcType="INTEGER" />
+		<result column="mo_goods_count" property="goodsCount" jdbcType="INTEGER" />
+		<result column="mo_pay_money" property="payMoney" jdbcType="DECIMAL" />
+		<result column="mo_hongbao_money" property="hongBaoMoney"
+			jdbcType="DECIMAL" />
+		<result column="mo_beizhu" property="beiZhu" jdbcType="VARCHAR" />
+		<result column="mo_read" property="read" jdbcType="BOOLEAN" />
+		<result column="mo_create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="mo_update_time" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="mo_happen_date" property="happendDate"
+			jdbcType="TIMESTAMP" />
+		<result column="mo_order_type" property="orderType" jdbcType="INTEGER" />
+		<association property="user" column="mo_uid"
+			javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
+			<id column="mo_uid" property="id" jdbcType="BIGINT" />
+		</association>
+
+	</resultMap>
+	<sql id="Base_Column_List">mo_id,mo_uid,mo_type,mo_order_id,mo_state,mo_goods_count,mo_pay_money,mo_hongbao_money,mo_beizhu,mo_read,mo_create_time,mo_update_time,mo_happen_date,mo_order_type
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_msg_order where mo_id = #{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectByUidAndOrderId" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_msg_order where mo_uid = #{uid,jdbcType=BIGINT} and
+		mo_order_id=#{orderId}  order by mo_id desc limit 1
+	</select>
+	<select id="listByOrderId" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_msg_order where mo_order_id = #{orderId}
+	</select>
+	<select id="listByUid" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_msg_order where mo_uid = #{uid,jdbcType=BIGINT} order by
+		mo_update_time desc limit #{start},#{count}
+	</select>
+	<select id="countByUid" resultType="java.lang.Long"
+		parameterType="java.lang.Long">select count(mo_id) from yeshi_ec_msg_order where mo_uid
+		= #{uid,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_msg_order where mo_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_msg_order
+		(mo_id,mo_uid,mo_type,mo_order_id,mo_state,mo_goods_count,mo_pay_money,mo_hongbao_money,mo_beizhu,mo_read,mo_create_time,mo_update_time,mo_happen_date,mo_order_type)
+		values
+		(#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{orderId,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{goodsCount,jdbcType=INTEGER},#{payMoney,jdbcType=DECIMAL},#{hongBaoMoney,jdbcType=DECIMAL},#{beiZhu,jdbcType=VARCHAR},#{read,jdbcType=BOOLEAN},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{happendDate,jdbcType=TIMESTAMP},#{orderType,jdbcType=INTEGER})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_msg_order
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">mo_id,</if>
+			<if test="user != null">mo_uid,</if>
+			<if test="type != null">mo_type,</if>
+			<if test="orderId != null">mo_order_id,</if>
+			<if test="state != null">mo_state,</if>
+			<if test="goodsCount != null">mo_goods_count,</if>
+			<if test="payMoney != null">mo_pay_money,</if>
+			<if test="hongBaoMoney != null">mo_hongbao_money,</if>
+			<if test="beiZhu != null">mo_beizhu,</if>
+			<if test="read != null">mo_read,</if>
+			<if test="createTime != null">mo_create_time,</if>
+			<if test="updateTime != null">mo_update_time,</if>
+			<if test="happendDate != null">mo_happen_date,</if>
+			<if test="orderType != null">mo_order_type,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="user != null">#{user.id,jdbcType=BIGINT},</if>
+			<if test="type != null">#{type,jdbcType=VARCHAR},</if>
+			<if test="orderId != null">#{orderId,jdbcType=VARCHAR},</if>
+			<if test="state != null">#{state,jdbcType=INTEGER},</if>
+			<if test="goodsCount != null">#{goodsCount,jdbcType=INTEGER},</if>
+			<if test="payMoney != null">#{payMoney,jdbcType=DECIMAL},</if>
+			<if test="hongBaoMoney != null">#{hongBaoMoney,jdbcType=DECIMAL},</if>
+			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
+			<if test="read != null">#{read,jdbcType=BOOLEAN},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="happendDate != null">#{happendDate,jdbcType=TIMESTAMP},</if>
+			<if test="orderType != null">#{orderType,jdbcType=INTEGER}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">update
+		yeshi_ec_msg_order set mo_uid = #{user.id,jdbcType=BIGINT},mo_type =
+		#{type,jdbcType=VARCHAR},mo_order_id =
+		#{orderId,jdbcType=VARCHAR},mo_state =
+		#{state,jdbcType=INTEGER},mo_goods_count =
+		#{goodsCount,jdbcType=INTEGER},mo_pay_money =
+		#{payMoney,jdbcType=DECIMAL},mo_hongbao_money =
+		#{hongBaoMoney,jdbcType=DECIMAL},mo_beizhu =
+		#{beiZhu,jdbcType=VARCHAR},mo_read =
+		#{read,jdbcType=BOOLEAN},mo_create_time =
+		#{createTime,jdbcType=TIMESTAMP},mo_update_time =
+		#{updateTime,jdbcType=TIMESTAMP},mo_happen_date=#{happendDate,jdbcType=TIMESTAMP}
+		,mo_order_type =#{orderType,jdbcType=INTEGER} where mo_id =
+		#{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">
+		update yeshi_ec_msg_order
+		<set>
+			<if test="user != null">mo_uid=#{user.id,jdbcType=BIGINT},</if>
+			<if test="type != null">mo_type=#{type,jdbcType=VARCHAR},</if>
+			<if test="orderId != null">mo_order_id=#{orderId,jdbcType=VARCHAR},</if>
+			<if test="state != null">mo_state=#{state,jdbcType=INTEGER},</if>
+			<if test="goodsCount != null">mo_goods_count=#{goodsCount,jdbcType=INTEGER},</if>
+			<if test="payMoney != null">mo_pay_money=#{payMoney,jdbcType=DECIMAL},</if>
+			<if test="hongBaoMoney != null">mo_hongbao_money=#{hongBaoMoney,jdbcType=DECIMAL},</if>
+			<if test="beiZhu != null">mo_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
+			<if test="read != null">mo_read=#{read,jdbcType=BOOLEAN},</if>
+			<if test="createTime != null">mo_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">mo_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="happendDate != null">mo_happen_date=#{happendDate,jdbcType=TIMESTAMP},</if>
+			<if test="orderType !=null">mo_order_type =#{orderType,jdbcType=INTEGER},</if>
+		</set>
+		where mo_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="setMsgReadByUid" parameterType="java.lang.Long">update
+		yeshi_ec_msg_order set mo_read=1 where mo_uid=#{0}
+	</update>
+</mapper>

--
Gitblit v1.8.0