From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgMoneyDetailMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgMoneyDetailMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgMoneyDetailMapper.xml
index 70aefe8..a712d6b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgMoneyDetailMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgMoneyDetailMapper.xml
@@ -17,6 +17,7 @@
<result column="mm_update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="mm_read" property="read" jdbcType="BOOLEAN" />
<result column="mm_order_type" property="orderType" jdbcType="INTEGER" />
+ <result column="mm_desc" property="desc" jdbcType="VARCHAR" />
<association property="user" column="mm_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
<id column="mm_uid" property="id" jdbcType="BIGINT" />
@@ -26,7 +27,7 @@
<association property="alipayAccountValid" column="mm_source_id_alipayvalid"
select="com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper.selectByPrimaryKey" />
</resultMap>
- <sql id="Base_Column_List">mm_id,mm_uid,mm_type,mm_order_count,mm_goods_count,mm_order_id,mm_source_id,mm_money,mm_balance,mm_state_desc,mm_beizhu,mm_create_time,mm_update_time,mm_read,mm_order_type
+ <sql id="Base_Column_List">mm_id,mm_uid,mm_type,mm_order_count,mm_goods_count,mm_order_id,mm_source_id,mm_money,mm_balance,mm_state_desc,mm_beizhu,mm_create_time,mm_update_time,mm_read,mm_order_type,mm_desc
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -57,9 +58,9 @@
</delete>
<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail"
useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_msg_money
- (mm_id,mm_uid,mm_type,mm_order_count,mm_goods_count,mm_order_id,mm_source_id,mm_money,mm_balance,mm_state_desc,mm_beizhu,mm_create_time,mm_update_time,mm_read,mm_order_type)
+ (mm_id,mm_uid,mm_type,mm_order_count,mm_goods_count,mm_order_id,mm_source_id,mm_money,mm_balance,mm_state_desc,mm_beizhu,mm_create_time,mm_update_time,mm_read,mm_order_type,mm_desc)
values
- (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{msgType,jdbcType=VARCHAR},#{orderCount,jdbcType=INTEGER},#{goodsCount,jdbcType=INTEGER},#{orderId,jdbcType=VARCHAR},#{extract.id,jdbcType=BIGINT},#{money,jdbcType=DECIMAL},#{balance,jdbcType=DECIMAL},#{stateDesc,jdbcType=VARCHAR},#{beiZhu,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{read,jdbcType=BOOLEAN},#{orderType,jdbcType=INTEGER})
+ (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{msgType,jdbcType=VARCHAR},#{orderCount,jdbcType=INTEGER},#{goodsCount,jdbcType=INTEGER},#{orderId,jdbcType=VARCHAR},#{extract.id,jdbcType=BIGINT},#{money,jdbcType=DECIMAL},#{balance,jdbcType=DECIMAL},#{stateDesc,jdbcType=VARCHAR},#{beiZhu,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{read,jdbcType=BOOLEAN},#{orderType,jdbcType=INTEGER},#{desc,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail"
useGeneratedKeys="true" keyProperty="id">
@@ -81,6 +82,7 @@
<if test="updateTime != null">mm_update_time,</if>
<if test="read != null">mm_read,</if>
<if test="orderType != null">mm_order_type,</if>
+ <if test="desc != null">mm_desc,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -100,6 +102,7 @@
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="read != null">#{read,jdbcType=BOOLEAN},</if>
<if test="orderType != null">#{orderType,jdbcType=INTEGER}</if>
+ <if test="desc != null">#{desc,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail">update
@@ -115,7 +118,8 @@
#{beiZhu,jdbcType=VARCHAR},mm_create_time =
#{createTime,jdbcType=TIMESTAMP},mm_update_time =
#{updateTime,jdbcType=TIMESTAMP},mm_read = #{read,jdbcType=BOOLEAN}
- ,mm_order_type =#{orderType,jdbcType=INTEGER} where mm_id =
+ ,mm_order_type =#{orderType,jdbcType=INTEGER},
+ mm_desc = #{desc,jdbcType=VARCHAR} where mm_id =
#{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail">
@@ -137,6 +141,7 @@
<if test="updateTime != null">mm_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="read != null">mm_read=#{read,jdbcType=BOOLEAN},</if>
<if test="orderType !=null">mm_order_type =#{orderType,jdbcType=INTEGER},</if>
+ <if test="desc != null">mm_desc=#{desc,jdbcType=VARCHAR},</if>
</set>
where mm_id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0