From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +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/MsgMoneyDetailMapper.xml | 54 ++++++++++++++++++++++--------------------------------
1 files changed, 22 insertions(+), 32 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 58651d4..70aefe8 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
@@ -16,17 +16,17 @@
<result column="mm_create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="mm_update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="mm_read" property="read" jdbcType="BOOLEAN" />
- <association property="user" column="mm_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
+ <result column="mm_order_type" property="orderType" jdbcType="INTEGER" />
+ <association property="user" column="mm_uid"
+ javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
<id column="mm_uid" property="id" jdbcType="BIGINT" />
</association>
<association property="extract" column="mm_source_id_extract"
- select="com.yeshi.fanli.dao.mybatis.ExtractMapper.selectByPrimaryKey">
- </association>
+ select="com.yeshi.fanli.dao.mybatis.ExtractMapper.selectByPrimaryKey" />
<association property="alipayAccountValid" column="mm_source_id_alipayvalid"
- select="com.yeshi.fanli.dao.mybatis.AlipayAccountValidNormalHistoryMapper.selectByPrimaryKey">
- </association>
+ 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
+ <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>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -34,42 +34,32 @@
<include refid="Base_Column_List" />
from yeshi_ec_msg_money where mm_id = #{id,jdbcType=BIGINT}
</select>
-
-
<select id="selectBySourceIdAndMsgType" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from yeshi_ec_msg_money where mm_source_id =
#{sourceId,jdbcType=BIGINT} and mm_type=#{type}
</select>
-
-
- <select id="listByUid" resultMap="BaseResultMap" >
+ <select id="listByUid" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />,
- mm_source_id as mm_source_id_extract,
- mm_source_id as mm_source_id_alipayvalid
- from yeshi_ec_msg_money where mm_uid = #{uid,jdbcType=BIGINT} order by
- mm_update_time desc limit #{start},#{count}
+ <include refid="Base_Column_List" />
+ , mm_source_id as mm_source_id_extract, mm_source_id as
+ mm_source_id_alipayvalid from yeshi_ec_msg_money where mm_uid =
+ #{uid,jdbcType=BIGINT} order by mm_update_time desc limit
+ #{start},#{count}
</select>
-
-
<select id="countByUid" resultType="java.lang.Long"
- parameterType="java.lang.Long">
- select
- count(mm_id)
- from yeshi_ec_msg_money where mm_uid =
- #{uid,jdbcType=BIGINT}
+ parameterType="java.lang.Long">select count(mm_id) from yeshi_ec_msg_money where mm_uid
+ = #{uid,jdbcType=BIGINT}
</select>
-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
yeshi_ec_msg_money where mm_id = #{id,jdbcType=BIGINT}
</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_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)
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})
+ (#{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})
</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail"
useGeneratedKeys="true" keyProperty="id">
@@ -90,6 +80,7 @@
<if test="createTime != null">mm_create_time,</if>
<if test="updateTime != null">mm_update_time,</if>
<if test="read != null">mm_read,</if>
+ <if test="orderType != null">mm_order_type,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -108,6 +99,7 @@
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="read != null">#{read,jdbcType=BOOLEAN},</if>
+ <if test="orderType != null">#{orderType,jdbcType=INTEGER}</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail">update
@@ -123,7 +115,8 @@
#{beiZhu,jdbcType=VARCHAR},mm_create_time =
#{createTime,jdbcType=TIMESTAMP},mm_update_time =
#{updateTime,jdbcType=TIMESTAMP},mm_read = #{read,jdbcType=BOOLEAN}
- where mm_id = #{id,jdbcType=BIGINT}
+ ,mm_order_type =#{orderType,jdbcType=INTEGER} where mm_id =
+ #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail">
update yeshi_ec_msg_money
@@ -143,14 +136,11 @@
<if test="createTime != null">mm_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<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>
</set>
where mm_id = #{id,jdbcType=BIGINT}
</update>
-
-
- <update id="setMsgReadByUid" parameterType="java.lang.Long">
- update
+ <update id="setMsgReadByUid" parameterType="java.lang.Long">update
yeshi_ec_msg_money set mm_read=1 where mm_uid=#{0}
</update>
-
</mapper>
--
Gitblit v1.8.0