From 0f73ccdaaa2864b49a127fb9f3a52d3c67b22add Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 18:05:20 +0800
Subject: [PATCH] 消息相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/ShareGoodsActivityOrderMapper.xml | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/ShareGoodsActivityOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/ShareGoodsActivityOrderMapper.xml
index 05b076b..469bff7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/ShareGoodsActivityOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/ShareGoodsActivityOrderMapper.xml
@@ -11,17 +11,17 @@
jdbcType="TIMESTAMP" />
<result column="sgao_update_time" property="updateTime"
jdbcType="TIMESTAMP" />
+ <result column="sgao_order_no" property="orderNo" jdbcType="VARCHAR" />
+
+ <result column="sgao_order_source_type" property="orderSourceType"
+ jdbcType="INTEGER" />
+
<association property="user" column="sgao_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
<id property="id" column="sgao_uid" jdbcType="BIGINT" />
</association>
- <association property="order" column="sgao_order_id"
- javaType="com.yeshi.fanli.entity.bus.user.Order">
- <id property="id" column="sgao_order_id" jdbcType="BIGINT" />
- </association>
-
</resultMap>
- <sql id="Base_Column_List">sgao_id,sgao_uid,sgao_order_id,sgao_share_rate,sgao_create_time,sgao_update_time
+ <sql id="Base_Column_List">sgao_id,sgao_uid,sgao_order_no,sgao_share_rate,sgao_create_time,sgao_update_time,sgao_order_source_type
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -46,7 +46,7 @@
select
<include refid="Base_Column_List" />
from yeshi_ec_share_goods_activity_order where sgao_uid =#{uid} and
- sgao_order_id=#{orderId}
+ sgao_order_no=#{orderId}
</select>
@@ -67,9 +67,9 @@
parameterType="com.yeshi.fanli.entity.order.ShareGoodsActivityOrder"
useGeneratedKeys="true" keyProperty="id">insert into
yeshi_ec_share_goods_activity_order
- (sgao_id,sgao_uid,sgao_order_id,sgao_share_rate,sgao_create_time,sgao_update_time)
+ (sgao_id,sgao_uid,sgao_order_no,sgao_share_rate,sgao_create_time,sgao_update_time,sgao_order_source_type)
values
- (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{order.id,jdbcType=BIGINT},#{shareRate,jdbcType=DECIMAL},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
+ (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{orderNo,jdbcType=VARCHAR},#{shareRate,jdbcType=DECIMAL},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{orderSourceType,jdbcType=INTEGER})
</insert>
<insert id="insertSelective"
parameterType="com.yeshi.fanli.entity.order.ShareGoodsActivityOrder"
@@ -78,28 +78,33 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">sgao_id,</if>
<if test="user != null">sgao_uid,</if>
- <if test="order != null">sgao_order_id,</if>
+ <if test="orderNo !=null">sgao_order_no,</if>
<if test="shareRate != null">sgao_share_rate,</if>
<if test="createTime != null">sgao_create_time,</if>
<if test="updateTime != null">sgao_update_time,</if>
+ <if test="orderSourceType != null">sgao_order_source_type,</if>
+
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="user != null">#{user.id,jdbcType=BIGINT},</if>
- <if test="order != null">#{order.id,jdbcType=BIGINT},</if>
+ <if test="orderNo !=null">#{orderNo,jdbcType=VARCHAR},</if>
<if test="shareRate != null">#{shareRate,jdbcType=DECIMAL},</if>
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+ <if test="orderSourceType != null">#{orderSourceType,jdbcType=INTEGER}</if>
</trim>
</insert>
<update id="updateByPrimaryKey"
parameterType="com.yeshi.fanli.entity.order.ShareGoodsActivityOrder">update yeshi_ec_share_goods_activity_order set sgao_uid
- = #{user.id,jdbcType=BIGINT},sgao_order_id =
- #{order.id,jdbcType=BIGINT},sgao_share_rate =
+ = #{user.id,jdbcType=BIGINT},sgao_order_no =
+ #{orderNo,jdbcType=VARCHAR},sgao_share_rate =
#{shareRate,jdbcType=DECIMAL},sgao_create_time =
#{createTime,jdbcType=TIMESTAMP},sgao_update_time =
- #{updateTime,jdbcType=TIMESTAMP} where sgao_id =
+ #{updateTime,jdbcType=TIMESTAMP},sgao_order_source_type
+ #{orderSourceType,jdbcType=INTEGER}
+ where sgao_id =
#{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective"
@@ -107,10 +112,11 @@
update yeshi_ec_share_goods_activity_order
<set>
<if test="user != null">sgao_uid=#{user.id,jdbcType=BIGINT},</if>
- <if test="order != null">sgao_order_id=#{order.id,jdbcType=BIGINT},</if>
+ <if test="orderNo !=null">sgao_order_no=#{orderNo,jdbcType=VARCHAR},</if>
<if test="shareRate != null">sgao_share_rate=#{shareRate,jdbcType=DECIMAL},</if>
<if test="createTime != null">sgao_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">sgao_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+ <if test="orderSourceType != null">sgao_order_source_type=#{orderSourceType,jdbcType=INTEGER},</if>
</set>
where sgao_id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0