From 2dff570ccfa532f8c012bc13829b302dd3e1b9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 29 十二月 2018 15:39:29 +0800
Subject: [PATCH] Merge branch 'master' into div1
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 873e681..5ae8feb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -71,7 +71,7 @@
</resultMap>
- <sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,cog_create_time,cog_update_time
+ <sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_create_time,co_update_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -88,7 +88,7 @@
yeshi_ec_common_order where co_id = #{id,jdbcType=BIGINT}</delete>
<insert id="insert" parameterType="com.yeshi.fanli.entity.order.CommonOrder"
useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_common_order
- (co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,cog_create_time,cog_update_time)
+ (co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_create_time,co_update_time)
values
(#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{orderNo,jdbcType=VARCHAR},#{sourceType,jdbcType=INTEGER},#{sourcePosition,jdbcType=VARCHAR},#{commonOrderGoods.id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{estimate,jdbcType=DECIMAL},#{eIncome,jdbcType=DECIMAL},#{payment,jdbcType=DECIMAL},#{settlement,jdbcType=DECIMAL},#{thirdCreateTime,jdbcType=TIMESTAMP},#{settleTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
</insert>
@@ -110,8 +110,8 @@
<if test="settlement != null">co_settlement,</if>
<if test="thirdCreateTime != null">co_third_create_time,</if>
<if test="settleTime != null">co_settle_time,</if>
- <if test="createTime != null">cog_create_time,</if>
- <if test="updateTime != null">cog_update_time,</if>
+ <if test="createTime != null">co_create_time,</if>
+ <if test="updateTime != null">co_update_time,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -147,8 +147,8 @@
#{payment,jdbcType=DECIMAL},co_settlement =
#{settlement,jdbcType=DECIMAL},co_third_create_time =
#{thirdCreateTime,jdbcType=TIMESTAMP},co_settle_time =
- #{settleTime,jdbcType=TIMESTAMP},cog_create_time =
- #{createTime,jdbcType=TIMESTAMP},cog_update_time =
+ #{settleTime,jdbcType=TIMESTAMP},co_create_time =
+ #{createTime,jdbcType=TIMESTAMP},co_update_time =
#{updateTime,jdbcType=TIMESTAMP} where co_id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.CommonOrder">
@@ -170,8 +170,8 @@
<if test="thirdCreateTime != null">co_third_create_time=#{thirdCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="settleTime != null">co_settle_time=#{settleTime,jdbcType=TIMESTAMP},</if>
- <if test="createTime != null">cog_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
- <if test="updateTime != null">cog_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+ <if test="createTime != null">co_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+ <if test="updateTime != null">co_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
</set>
where co_id = #{id,jdbcType=BIGINT}
</update>
@@ -308,7 +308,7 @@
totalSettlement,COALESCE(SUM(tc.`co_count`),0)AS
totalCount,tc.`co_source_type`,tc.`co_order_no`,tg.*
FROM yeshi_ec_common_order_goods tg
- LEFT JOIN yeshi_ec_common_order tc ON tc.`co_order_goods_id` = tg.`cog_id`
+ LEFT JOIN yeshi_ec_common_order tc ON tc.`co_order_goods_id` = tg.`co_id`
WHERE
<foreach collection="list" item="item" separator=" OR ">
(tc.`co_source_type` = #{item.sourceType,jdbcType=INTEGER} AND
--
Gitblit v1.8.0