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/MsgOrderDetailMapper.xml | 55 ++++++++++++++++++++-----------------------------------
1 files changed, 20 insertions(+), 35 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 60bf049..3179e7f 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
@@ -16,14 +16,16 @@
<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" />
- <association property="user" column="mo_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
+ <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
+ <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">
@@ -31,51 +33,36 @@
<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}
</select>
-
-
- <select id="listByOrderId" resultMap="BaseResultMap" parameterType="java.lang.String">
+ <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}
+ 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_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})
+ (#{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">
@@ -94,9 +81,7 @@
<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=",">
@@ -113,6 +98,7 @@
<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
@@ -126,8 +112,9 @@
#{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} where mo_id = #{id,jdbcType=BIGINT}
-
+ #{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
@@ -144,13 +131,11 @@
<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
+ <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