From f1813be797e7d2e168dc98005f52e145c9d8bedd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 27 四月 2020 11:14:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 bea6c81..d8a7ea0 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
@@ -19,6 +19,7 @@
<result column="mo_happen_date" property="happendDate"
jdbcType="TIMESTAMP" />
<result column="mo_order_type" property="orderType" jdbcType="INTEGER" />
+ <result column="mo_unique_key" property="uniquekey" jdbcType="VARCHAR"/>
<result column="extraInfo" property="extraInfo" jdbcType="VARCHAR"/>
<association property="user" column="mo_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
@@ -26,7 +27,7 @@
</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 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,mo_unique_key
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -57,14 +58,22 @@
parameterType="java.lang.Long">select count(mo_id) from yeshi_ec_msg_order where mo_uid
= #{uid,jdbcType=BIGINT}
</select>
+
+
+ <select id="getByUniqueKey" resultMap="BaseResultMap">
+ select * from yeshi_ec_msg_order
+ where mo_unique_key = #{uniqueKey}
+ </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)
+ (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,mo_unique_key)
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})
+ (#{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},#{uniquekey,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail"
useGeneratedKeys="true" keyProperty="id">
@@ -84,6 +93,7 @@
<if test="updateTime != null">mo_update_time,</if>
<if test="happendDate != null">mo_happen_date,</if>
<if test="orderType != null">mo_order_type,</if>
+ <if test="uniquekey != null">mo_unique_key,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -101,6 +111,7 @@
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="happendDate != null">#{happendDate,jdbcType=TIMESTAMP},</if>
<if test="orderType != null">#{orderType,jdbcType=INTEGER},</if>
+ <if test="uniquekey != null">#{uniquekey,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">update
@@ -115,8 +126,8 @@
#{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}
+ ,mo_order_type =#{orderType,jdbcType=INTEGER},mo_unique_key = #{uniquekey,jdbcType=VARCHAR}
+ where mo_id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">
update yeshi_ec_msg_order
@@ -134,6 +145,7 @@
<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>
+ <if test="uniquekey != null">mo_unique_key=#{uniquekey,jdbcType=VARCHAR},</if>
</set>
where mo_id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0