From 1193f141ae9499d2446aa99e9c4fdc75e7552b7d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 4d3da72..bea6c81 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="extraInfo" property="extraInfo" jdbcType="VARCHAR"/>
<association property="user" column="mo_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
<id column="mo_uid" property="id" jdbcType="BIGINT" />
@@ -46,10 +47,11 @@
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 d.*, t.`mea_content` AS extraInfo FROM yeshi_ec_msg_order d
+ LEFT JOIN `yeshi_ec_msg_extra` t ON (t.`mea_rid` = d.`mo_id` AND t.`mea_type` = 'order')
+ WHERE d.mo_uid = #{uid,jdbcType=BIGINT}
+ ORDER BY d.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
@@ -98,7 +100,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>
+ <if test="orderType != null">#{orderType,jdbcType=INTEGER},</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">update
@@ -113,7 +115,7 @@
#{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 =
+ ,mo_order_type =#{orderType,jdbcType=INTEGER} where mo_id =
#{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">
--
Gitblit v1.8.0