From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 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..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,13 +19,15 @@
 		<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">
 			<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,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">
@@ -46,23 +48,32 @@
 		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
 		= #{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">
@@ -82,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=",">
@@ -98,7 +110,8 @@
 			<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>
+			<if test="uniquekey != null">#{uniquekey,jdbcType=VARCHAR},</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.msg.MsgOrderDetail">update
@@ -113,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
@@ -132,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